Commit f1902860 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] fix improper CONFIG_SND_MAJOR usage 



Modules: HWDEP Midlevel,PCM Midlevel,RawMidi Midlevel,ALSA Core

Replace usage of CONFIG_SND_MAJOR with snd_major, where appropriate.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent c8a7e5c4

include/sound/core.h

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ typedef struct _snd_minor snd_minor_t; 


/* sound.c */



extern int snd_major;

extern int snd_ecards_limit;



void snd_request_card(int card);

sound/core/hwdep.c

+3 −7
Original line number Diff line number Diff line
@@ -81,20 +81,16 @@ static int snd_hwdep_open(struct inode *inode, struct file * file) 
	int err;

	wait_queue_t wait;



	switch (major) {

	case CONFIG_SND_MAJOR:

	if (major == snd_major) {

		cardnum = SNDRV_MINOR_CARD(iminor(inode));

		device = SNDRV_MINOR_DEVICE(iminor(inode)) - SNDRV_MINOR_HWDEP;

		break;

#ifdef CONFIG_SND_OSSEMUL

	case SOUND_MAJOR:

	} else if (major == SOUND_MAJOR) {

		cardnum = SNDRV_MINOR_OSS_CARD(iminor(inode));

		device = 0;

		break;

#endif

	default:

	} else

		return -ENXIO;

	}

	cardnum %= SNDRV_CARDS;

	device %= SNDRV_MINOR_HWDEPS;

	hw = snd_hwdep_devices[(cardnum * SNDRV_MINOR_HWDEPS) + device];

sound/core/pcm_native.c

+0 −1
Original line number Diff line number Diff line
@@ -1522,7 +1522,6 @@ static int snd_pcm_drop(snd_pcm_substream_t *substream) 




/* WARNING: Don't forget to fput back the file */

extern int snd_major;

static struct file *snd_pcm_file_fd(int fd)

{

	struct file *file;

sound/core/rawmidi.c

+4 −8
Original line number Diff line number Diff line
@@ -378,24 +378,20 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) 
	struct list_head *list;

	snd_ctl_file_t *kctl;



	switch (maj) {

	case CONFIG_SND_MAJOR:

	if (maj == snd_major) {

		cardnum = SNDRV_MINOR_CARD(iminor(inode));

		cardnum %= SNDRV_CARDS;

		device = SNDRV_MINOR_DEVICE(iminor(inode)) - SNDRV_MINOR_RAWMIDI;

		device %= SNDRV_MINOR_RAWMIDIS;

		break;

#ifdef CONFIG_SND_OSSEMUL

	case SOUND_MAJOR:

	} else if (maj == SOUND_MAJOR) {

		cardnum = SNDRV_MINOR_OSS_CARD(iminor(inode));

		cardnum %= SNDRV_CARDS;

		device = SNDRV_MINOR_OSS_DEVICE(iminor(inode)) == SNDRV_MINOR_OSS_MIDI ?

			midi_map[cardnum] : amidi_map[cardnum];

		break;

#endif

	default:

	} else

		return -ENXIO;

	}



	rmidi = snd_rawmidi_devices[(cardnum * SNDRV_RAWMIDI_DEVICES) + device];

	if (rmidi == NULL)
@@ -411,7 +407,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) 
	if (err < 0)

		return -ENODEV;

	fflags = snd_rawmidi_file_flags(file);

	if ((file->f_flags & O_APPEND) || maj != CONFIG_SND_MAJOR) /* OSS emul? */

	if ((file->f_flags & O_APPEND) || maj == SOUND_MAJOR) /* OSS emul? */

		fflags |= SNDRV_RAWMIDI_LFLG_APPEND;

	fflags |= SNDRV_RAWMIDI_LFLG_NOOPENLOCK;

	rawmidi_file = kmalloc(sizeof(*rawmidi_file), GFP_KERNEL);