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

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

[ALSA] remove unused snd_minor.name field 



Drop the snd_minor structure's name field that was just a helper for
devfs device deregistration.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent b130807d

include/sound/core.h

+0 −2
Original line number Diff line number Diff line
@@ -188,8 +188,6 @@ struct snd_minor { 
	int device;			/* device number */

	const struct file_operations *f_ops;	/* file operations */

	void *private_data;		/* private data for f_ops->open */

	char name[0];			/* device name (keep at the end of

								structure) */

};



/* sound.c */

sound/core/sound.c

+1 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ int snd_register_device(int type, struct snd_card *card, int dev, 
	struct device *device = NULL;



	snd_assert(name, return -EINVAL);

	preg = kmalloc(sizeof(struct snd_minor) + strlen(name) + 1, GFP_KERNEL);

	preg = kmalloc(sizeof *preg, GFP_KERNEL);

	if (preg == NULL)

		return -ENOMEM;

	preg->type = type;
@@ -252,7 +252,6 @@ int snd_register_device(int type, struct snd_card *card, int dev, 
	preg->device = dev;

	preg->f_ops = f_ops;

	preg->private_data = private_data;

	strcpy(preg->name, name);

	mutex_lock(&sound_mutex);

#ifdef CONFIG_SND_DYNAMIC_MINORS

	minor = snd_find_free_minor();