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

Commit abe9ab8f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

device create: sound: convert device_create_drvdata to device_create 



Now that device_create() has been audited, rename things back to the
original call to be sane.

Cc: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d73a1a67

sound/core/init.c

+3 −3
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ int snd_card_register(struct snd_card *card) 
		return -EINVAL;

#ifndef CONFIG_SYSFS_DEPRECATED

	if (!card->card_dev) {

		card->card_dev = device_create_drvdata(sound_class, card->dev,

		card->card_dev = device_create(sound_class, card->dev,

					       MKDEV(0, 0), NULL,

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

		if (IS_ERR(card->card_dev))

sound/core/sound.c

+2 −3
Original line number Diff line number Diff line
@@ -274,8 +274,7 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev, 
		return minor;

	}

	snd_minors[minor] = preg;

	preg->dev = device_create_drvdata(sound_class, device,

					  MKDEV(major, minor),

	preg->dev = device_create(sound_class, device, MKDEV(major, minor),

				  private_data, "%s", name);

	if (IS_ERR(preg->dev)) {

		snd_minors[minor] = NULL;

sound/oss/soundcard.c

+7 −8
Original line number Diff line number Diff line
@@ -560,19 +560,18 @@ static int __init oss_init(void) 
	sound_dmap_flag = (dmabuf > 0 ? 1 : 0);



	for (i = 0; i < ARRAY_SIZE(dev_list); i++) {

		device_create_drvdata(sound_class, NULL,

				      MKDEV(SOUND_MAJOR, dev_list[i].minor),

				      NULL, "%s", dev_list[i].name);

		device_create(sound_class, NULL,

			      MKDEV(SOUND_MAJOR, dev_list[i].minor), NULL,

			      "%s", dev_list[i].name);



		if (!dev_list[i].num)

			continue;



		for (j = 1; j < *dev_list[i].num; j++)

			device_create_drvdata(sound_class, NULL,

			device_create(sound_class, NULL,

				      MKDEV(SOUND_MAJOR,

					    dev_list[i].minor + (j*0x10)),

					      NULL,

					      "%s%d", dev_list[i].name, j);

				      NULL, "%s%d", dev_list[i].name, j);

	}



	if (sound_nblocks >= 1024)

sound/sound_core.c

+2 −3
Original line number Diff line number Diff line
@@ -220,8 +220,7 @@ static int sound_insert_unit(struct sound_unit **list, const struct file_operati 
	else

		sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP);



	device_create_drvdata(sound_class, dev,

			      MKDEV(SOUND_MAJOR, s->unit_minor),

	device_create(sound_class, dev, MKDEV(SOUND_MAJOR, s->unit_minor),

		      NULL, s->name+6);

	return r;