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>

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