diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 08:20:19 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 05:17:52 -0500 |
commit | 60c5772b50fe8ce947685cfe3a80b9bf6ea92831 (patch) | |
tree | ad2d8a112bd708ff58f96ccb2ec7b15d88676379 /sound/pci/ymfpci | |
parent | 4323cc4d5b25b5138c0791e3c7d3b09bd7062b49 (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/ymfpci')
-rw-r--r-- | sound/pci/ymfpci/ymfpci.c | 3 | ||||
-rw-r--r-- | sound/pci/ymfpci/ymfpci_main.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c index e8932b2e4a5d..6ff4ea389b02 100644 --- a/sound/pci/ymfpci/ymfpci.c +++ b/sound/pci/ymfpci/ymfpci.c | |||
@@ -187,7 +187,8 @@ static int snd_card_ymfpci_probe(struct pci_dev *pci, | |||
187 | return -ENOENT; | 187 | return -ENOENT; |
188 | } | 188 | } |
189 | 189 | ||
190 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); | 190 | err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE, |
191 | 0, &card); | ||
191 | if (err < 0) | 192 | if (err < 0) |
192 | return err; | 193 | return err; |
193 | 194 | ||
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index d591c154fc58..c7e98ff4f80f 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c | |||
@@ -2487,8 +2487,6 @@ int snd_ymfpci_create(struct snd_card *card, | |||
2487 | 2487 | ||
2488 | snd_ymfpci_proc_init(card, chip); | 2488 | snd_ymfpci_proc_init(card, chip); |
2489 | 2489 | ||
2490 | snd_card_set_dev(card, &pci->dev); | ||
2491 | |||
2492 | *rchip = chip; | 2490 | *rchip = chip; |
2493 | return 0; | 2491 | return 0; |
2494 | } | 2492 | } |