kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Also remove superfluous snd_card_set_dev() calls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2014-01-29 14:38:59 +01:00
parent 5815f5550b
commit 1076879744
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sound/aoa/core/alsa.c
View file

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

4
sound/ppc/powermac.c
View file

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

4
sound/ppc/snd_ps3.c
View file

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