diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 20:03:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-16 09:24:44 -0700 |
| commit | abe9ab8f62203ced11119fb96acc3b8dd107ebc4 (patch) | |
| tree | cb6d6667e6fc216efdfa5b1ba4a3e46c92798090 /sound/core | |
| parent | d73a1a674b5383bb3b38ae3dd625504ffc623d90 (diff) | |
| download | linux-abe9ab8f62203ced11119fb96acc3b8dd107ebc4.tar.gz linux-abe9ab8f62203ced11119fb96acc3b8dd107ebc4.tar.bz2 linux-abe9ab8f62203ced11119fb96acc3b8dd107ebc4.zip | |
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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/init.c | 6 | ||||
| -rw-r--r-- | sound/core/sound.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 8af467df9245..ef2352c2e451 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -549,9 +549,9 @@ 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, - MKDEV(0, 0), NULL, - "card%i", card->number); + card->card_dev = device_create(sound_class, card->dev, + MKDEV(0, 0), NULL, + "card%i", card->number); if (IS_ERR(card->card_dev)) card->card_dev = NULL; } diff --git a/sound/core/sound.c b/sound/core/sound.c index c0685e2f0afa..44a69bb8d4f0 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c @@ -274,9 +274,8 @@ 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), - private_data, "%s", name); + preg->dev = device_create(sound_class, device, MKDEV(major, minor), + private_data, "%s", name); if (IS_ERR(preg->dev)) { snd_minors[minor] = NULL; mutex_unlock(&sound_mutex); |