diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 14:37:20 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-14 08:14:06 +0100 |
| commit | 5815f5550b7f0dba3459cdb56c4977715fca3468 (patch) | |
| tree | e6e64bca3efd7dbf8d85d0070f581fb9525cdc61 /sound/pcmcia | |
| parent | 5f32c314f9c2a4e2e88de3ef23aa35580a0a19e5 (diff) | |
| download | linux-stable-5815f5550b7f0dba3459cdb56c4977715fca3468.tar.gz linux-stable-5815f5550b7f0dba3459cdb56c4977715fca3468.tar.bz2 linux-stable-5815f5550b7f0dba3459cdb56c4977715fca3468.zip | |
ALSA: pcmcia: 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/pcmcia')
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 5 | ||||
| -rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 8f489de5c4c6..56bda124cd4a 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c @@ -112,7 +112,8 @@ static int snd_pdacf_probe(struct pcmcia_device *link) return -ENODEV; /* disabled explicitly */ /* 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) { snd_printk(KERN_ERR "pdacf: cannot create a card instance\n"); return err; @@ -131,8 +132,6 @@ static int snd_pdacf_probe(struct pcmcia_device *link) return err; } - snd_card_set_dev(card, &link->dev); - pdacf->index = i; card_list[i] = card; diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index d4db7ecaa6bf..786e7e139c9e 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c @@ -238,7 +238,6 @@ static int vxpocket_config(struct pcmcia_device *link) goto failed; chip->dev = &link->dev; - snd_card_set_dev(chip->card, chip->dev); if (snd_vxpocket_assign_resources(chip, link->resource[0]->start, link->irq) < 0) @@ -307,7 +306,8 @@ static int vxpocket_probe(struct pcmcia_device *p_dev) return -ENODEV; /* disabled explicitly */ /* 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) { snd_printk(KERN_ERR "vxpocket: cannot create a card instance\n"); return err; |