ALSA: ppc: Convert to snd_card_new() with a device pointer

Also remove superfluous snd_card_set_dev() calls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/aoa/core/alsa.c b/sound/aoa/core/alsa.c
index 0fa3855b4790e30753b7b8ea4fb29644a6e8cd1f..9913bf222073537aea1ba8b7b9ac42c7cfa1d9e5 100644 (file)
--- a/sound/aoa/core/alsa.c
+++ b/sound/aoa/core/alsa.c
@@ -23,13 +23,12 @@ int aoa_alsa_init(char *name, struct module *mod, struct device *dev)
                /* cannot be EEXIST due to usage in aoa_fabric_register */
                return -EBUSY;
 
-       err = snd_card_create(index, name, mod, sizeof(struct aoa_card),
-                             &alsa_card);
+       err = snd_card_new(dev, index, name, mod, sizeof(struct aoa_card),
+                          &alsa_card);
        if (err < 0)
                return err;
        aoa_card = alsa_card->private_data;
        aoa_card->alsa_card = alsa_card;
-       alsa_card->dev = dev;
        strlcpy(alsa_card->driver, "AppleOnbdAudio", sizeof(alsa_card->driver));
        strlcpy(alsa_card->shortname, name, sizeof(alsa_card->shortname));
        strlcpy(alsa_card->longname, name, sizeof(alsa_card->longname));

diff --cc sound/ppc/powermac.c
Simple merge

diff --cc sound/ppc/snd_ps3.c
Simple merge