mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-05 06:39:27 +00: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 <tiwai@suse.de>
This commit is contained in:
parent
5815f5550b
commit
1076879744
@ -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));
|
||||
|
@ -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 New Issue
Block a user