aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/rme9652/hdsp.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 08:20:19 -0500
committerTakashi Iwai <tiwai@suse.de>2014-02-12 05:17:52 -0500
commit60c5772b50fe8ce947685cfe3a80b9bf6ea92831 (patch)
treead2d8a112bd708ff58f96ccb2ec7b15d88676379 /sound/pci/rme9652/hdsp.c
parent4323cc4d5b25b5138c0791e3c7d3b09bd7062b49 (diff)
ALSA: pci: 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/pci/rme9652/hdsp.c')
-rw-r--r--sound/pci/rme9652/hdsp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index bd90c80bb494..825fbbea7f6f 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -5375,8 +5375,8 @@ static int snd_hdsp_probe(struct pci_dev *pci,
5375 return -ENOENT; 5375 return -ENOENT;
5376 } 5376 }
5377 5377
5378 err = snd_card_create(index[dev], id[dev], THIS_MODULE, 5378 err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
5379 sizeof(struct hdsp), &card); 5379 sizeof(struct hdsp), &card);
5380 if (err < 0) 5380 if (err < 0)
5381 return err; 5381 return err;
5382 5382
@@ -5384,7 +5384,6 @@ static int snd_hdsp_probe(struct pci_dev *pci,
5384 card->private_free = snd_hdsp_card_free; 5384 card->private_free = snd_hdsp_card_free;
5385 hdsp->dev = dev; 5385 hdsp->dev = dev;
5386 hdsp->pci = pci; 5386 hdsp->pci = pci;
5387 snd_card_set_dev(card, &pci->dev);
5388 5387
5389 if ((err = snd_hdsp_create(card, hdsp)) < 0) { 5388 if ((err = snd_hdsp_create(card, hdsp)) < 0) {
5390 snd_card_free(card); 5389 snd_card_free(card);