Commit 89409211 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

device create: sound: convert device_create to device_create_drvdata

device_create() is race-prone, so use the race-free
device_create_drvdata() instead as device_create() is going away.

Cc: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9def0b97
...@@ -548,8 +548,9 @@ int snd_card_register(struct snd_card *card) ...@@ -548,8 +548,9 @@ int snd_card_register(struct snd_card *card)
snd_assert(card != NULL, return -EINVAL); snd_assert(card != NULL, return -EINVAL);
#ifndef CONFIG_SYSFS_DEPRECATED #ifndef CONFIG_SYSFS_DEPRECATED
if (!card->card_dev) { if (!card->card_dev) {
card->card_dev = device_create(sound_class, card->dev, 0, card->card_dev = device_create_drvdata(sound_class, card->dev,
"card%i", card->number); MKDEV(0, 0), NULL,
"card%i", card->number);
if (IS_ERR(card->card_dev)) if (IS_ERR(card->card_dev))
card->card_dev = NULL; card->card_dev = NULL;
} }
......
...@@ -560,17 +560,19 @@ static int __init oss_init(void) ...@@ -560,17 +560,19 @@ static int __init oss_init(void)
sound_dmap_flag = (dmabuf > 0 ? 1 : 0); sound_dmap_flag = (dmabuf > 0 ? 1 : 0);
for (i = 0; i < ARRAY_SIZE(dev_list); i++) { for (i = 0; i < ARRAY_SIZE(dev_list); i++) {
device_create(sound_class, NULL, device_create_drvdata(sound_class, NULL,
MKDEV(SOUND_MAJOR, dev_list[i].minor), MKDEV(SOUND_MAJOR, dev_list[i].minor),
"%s", dev_list[i].name); NULL, "%s", dev_list[i].name);
if (!dev_list[i].num) if (!dev_list[i].num)
continue; continue;
for (j = 1; j < *dev_list[i].num; j++) for (j = 1; j < *dev_list[i].num; j++)
device_create(sound_class, NULL, device_create_drvdata(sound_class, NULL,
MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)), MKDEV(SOUND_MAJOR,
"%s%d", dev_list[i].name, j); dev_list[i].minor + (j*0x10)),
NULL,
"%s%d", dev_list[i].name, j);
} }
if (sound_nblocks >= 1024) if (sound_nblocks >= 1024)
......
...@@ -171,8 +171,9 @@ static int sound_insert_unit(struct sound_unit **list, const struct file_operati ...@@ -171,8 +171,9 @@ static int sound_insert_unit(struct sound_unit **list, const struct file_operati
else else
sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP); sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP);
device_create(sound_class, dev, MKDEV(SOUND_MAJOR, s->unit_minor), device_create_drvdata(sound_class, dev,
s->name+6); MKDEV(SOUND_MAJOR, s->unit_minor),
NULL, s->name+6);
return r; return r;
fail: fail:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment