mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
ALSA: ppc: Convert to snd_card_new() with a device pointer
Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <[email protected]>
This commit is contained in:
parent
5815f5550b
commit
1076879744
3 changed files with 5 additions and 8 deletions
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue