adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

device create: sound: convert device_create to device_create_drvdata

Browse source 
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: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2008-05-21 12:52:33 -07:00
parent 9def0b9761
commit 89409211ff
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sound/core/init.c
View file

@ -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;
} }

14
sound/oss/soundcard.c
View file

@ -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)

5
sound/sound_core.c
View file

@ -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: