leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: pcmcia: 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:37:20 +01:00
parent 5f32c314f9
commit 5815f5550b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/pcmcia/pdaudiocf/pdaudiocf.c
View File

@ -112,7 +112,8 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
return -ENODEV; /* disabled explicitly */ return -ENODEV; /* disabled explicitly */
/* ok, create a card instance */ /* ok, create a card instance */
err = snd_card_create(index[i], id[i], THIS_MODULE, 0, &card); err = snd_card_new(&link->dev, index[i], id[i], THIS_MODULE,
0, &card);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "pdacf: cannot create a card instance\n"); snd_printk(KERN_ERR "pdacf: cannot create a card instance\n");
return err; return err;
@ -131,8 +132,6 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
return err; return err;
} }
snd_card_set_dev(card, &link->dev);
pdacf->index = i; pdacf->index = i;
card_list[i] = card; card_list[i] = card;

4
sound/pcmcia/vx/vxpocket.c
View File

@ -238,7 +238,6 @@ static int vxpocket_config(struct pcmcia_device *link)
goto failed; goto failed;
chip->dev = &link->dev; chip->dev = &link->dev;
snd_card_set_dev(chip->card, chip->dev);
if (snd_vxpocket_assign_resources(chip, link->resource[0]->start, if (snd_vxpocket_assign_resources(chip, link->resource[0]->start,
link->irq) < 0) link->irq) < 0)
@ -307,7 +306,8 @@ static int vxpocket_probe(struct pcmcia_device *p_dev)
return -ENODEV; /* disabled explicitly */ return -ENODEV; /* disabled explicitly */
/* ok, create a card instance */ /* ok, create a card instance */
err = snd_card_create(index[i], id[i], THIS_MODULE, 0, &card); err = snd_card_new(&p_dev->dev, index[i], id[i], THIS_MODULE,
0, &card);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "vxpocket: cannot create a card instance\n"); snd_printk(KERN_ERR "vxpocket: cannot create a card instance\n");
return err; return err;