diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 17:38:59 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-14 11:14:06 +0400 |
| commit | 1076879744d1b7709d5b7556cfe038039fbc01f9 (patch) | |
| tree | 0aa758cb989c2763e4c4e7b0aa94fb3c280dddcc /sound | |
| parent | 5815f5550b7f0dba3459cdb56c4977715fca3468 (diff) | |
| download | linux-1076879744d1b7709d5b7556cfe038039fbc01f9.tar.xz | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/aoa/core/alsa.c | 5 | ||||
| -rw-r--r-- | sound/ppc/powermac.c | 4 | ||||
| -rw-r--r-- | sound/ppc/snd_ps3.c | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/sound/aoa/core/alsa.c b/sound/aoa/core/alsa.c index 0fa3855b4790..9913bf222073 100644 --- 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 --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c index 8abb521b4814..350a7c8f86dd 100644 --- a/sound/ppc/powermac.c +++ b/sound/ppc/powermac.c @@ -58,7 +58,7 @@ static int snd_pmac_probe(struct platform_device *devptr) char *name_ext; int err; - err = snd_card_create(index, id, THIS_MODULE, 0, &card); + err = snd_card_new(&devptr->dev, index, id, THIS_MODULE, 0, &card); if (err < 0) return err; @@ -122,8 +122,6 @@ static int snd_pmac_probe(struct platform_device *devptr) if (enable_beep) snd_pmac_attach_beep(chip); - snd_card_set_dev(card, &devptr->dev); - if ((err = snd_card_register(card)) < 0) goto __error; diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index ebb76f2d90d7..58f292a87f98 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c @@ -984,7 +984,8 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev) } /* create card instance */ - ret = snd_card_create(index, id, THIS_MODULE, 0, &the_card.card); + ret = snd_card_new(&dev->core, index, id, THIS_MODULE, + 0, &the_card.card); if (ret < 0) goto clean_irq; @@ -1052,7 +1053,6 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev) snd_ps3_init_avsetting(&the_card); /* register the card */ - snd_card_set_dev(the_card.card, &dev->core); ret = snd_card_register(the_card.card); if (ret < 0) goto clean_dma_map; |