summaryrefslogtreecommitdiffstats
path: root/sound/drivers/mtpav.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 12:59:08 +0100
committerTakashi Iwai <tiwai@suse.de>2014-02-12 10:58:20 +0100
commit5872f3f621f9f65342583a85ec93b00c0a697eda (patch)
tree6deaa1d968889986fcf84a38abb436961e613f60 /sound/drivers/mtpav.c
parent393aa9c1cc514774332d7bc861307a76206e358d (diff)
downloadop-kernel-dev-5872f3f621f9f65342583a85ec93b00c0a697eda.zip
op-kernel-dev-5872f3f621f9f65342583a85ec93b00c0a697eda.tar.gz
ALSA: drivers: 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/drivers/mtpav.c')
-rw-r--r--sound/drivers/mtpav.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index e5ec7eb..4b66c7f 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -697,7 +697,8 @@ static int snd_mtpav_probe(struct platform_device *dev)
int err;
struct mtpav *mtp_card;
- err = snd_card_create(index, id, THIS_MODULE, sizeof(*mtp_card), &card);
+ err = snd_card_new(&dev->dev, index, id, THIS_MODULE,
+ sizeof(*mtp_card), &card);
if (err < 0)
return err;
@@ -732,7 +733,6 @@ static int snd_mtpav_probe(struct platform_device *dev)
snd_mtpav_portscan(mtp_card);
- snd_card_set_dev(card, &dev->dev);
err = snd_card_register(mtp_card->card);
if (err < 0)
goto __error;
OpenPOWER on IntegriCloud