Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80d7d771 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: Drop unused name argument in snd_register_oss_device() 



The last argument, name, of snd_oss_register_device() is nowhere
referred in the function in the current code.  Let's drop it.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c4d14893

include/sound/core.h

+1 −2
Original line number Diff line number Diff line
@@ -249,8 +249,7 @@ int snd_add_device_sysfs_file(int type, struct snd_card *card, int dev, 


#ifdef CONFIG_SND_OSSEMUL

int snd_register_oss_device(int type, struct snd_card *card, int dev,

			    const struct file_operations *f_ops, void *private_data,

			    const char *name);

			    const struct file_operations *f_ops, void *private_data);

int snd_unregister_oss_device(int type, struct snd_card *card, int dev);

void *snd_lookup_oss_minor_data(unsigned int minor, int type);

#endif

include/sound/hwdep.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct snd_hwdep { 
	int iface;



#ifdef CONFIG_SND_OSSEMUL

	char oss_dev[32];

	int oss_type;

	int ossreg;

#endif

sound/core/hwdep.c

+1 −2
Original line number Diff line number Diff line
@@ -442,8 +442,7 @@ static int snd_hwdep_dev_register(struct snd_device *device) 
		} else {

			if (snd_register_oss_device(hwdep->oss_type,

						    hwdep->card, hwdep->device,

						    &snd_hwdep_f_ops, hwdep,

						    hwdep->oss_dev) < 0) {

						    &snd_hwdep_f_ops, hwdep) < 0) {

				snd_printk(KERN_ERR "unable to register OSS compatibility device %i:%i\n",

					   hwdep->card->number, hwdep->device);

			} else

sound/core/oss/mixer_oss.c

+3 −5
Original line number Diff line number Diff line
@@ -1343,18 +1343,15 @@ static int snd_mixer_oss_notify_handler(struct snd_card *card, int cmd) 
	struct snd_mixer_oss *mixer;



	if (cmd == SND_MIXER_OSS_NOTIFY_REGISTER) {

		char name[128];

		int idx, err;



		mixer = kcalloc(2, sizeof(*mixer), GFP_KERNEL);

		if (mixer == NULL)

			return -ENOMEM;

		mutex_init(&mixer->reg_mutex);

		sprintf(name, "mixer%i%i", card->number, 0);

		if ((err = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIXER,

						   card, 0,

						   &snd_mixer_oss_f_ops, card,

						   name)) < 0) {

						   &snd_mixer_oss_f_ops, card)) < 0) {

			snd_printk(KERN_ERR "unable to register OSS mixer device %i:%i\n",

				   card->number, 0);

			kfree(mixer);
@@ -1365,7 +1362,8 @@ static int snd_mixer_oss_notify_handler(struct snd_card *card, int cmd) 
		if (*card->mixername)

			strlcpy(mixer->name, card->mixername, sizeof(mixer->name));

		else

			strlcpy(mixer->name, name, sizeof(mixer->name));

			snprintf(mixer->name, sizeof(mixer->name),

				 "mixer%i", card->number);

#ifdef SNDRV_OSS_INFO_DEV_MIXERS

		snd_oss_info_register(SNDRV_OSS_INFO_DEV_MIXERS,

				      card->number,

sound/core/oss/pcm_oss.c

+1 −3
Original line number Diff line number Diff line
@@ -3007,11 +3007,9 @@ static const struct file_operations snd_pcm_oss_f_reg = 


static void register_oss_dsp(struct snd_pcm *pcm, int index)

{

	char name[128];

	sprintf(name, "dsp%i%i", pcm->card->number, pcm->device);

	if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_PCM,

				    pcm->card, index, &snd_pcm_oss_f_reg,

				    pcm, name) < 0) {

				    pcm) < 0) {

		snd_printk(KERN_ERR "unable to register OSS PCM device %i:%i\n",

			   pcm->card->number, pcm->device);

	}