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/fm801.c | |
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/fm801.c')
-rw-r--r-- | sound/pci/fm801.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index 45bc8a95b7c4..8b6af212cbfe 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c | |||
@@ -1251,8 +1251,6 @@ static int snd_fm801_create(struct snd_card *card, | |||
1251 | return err; | 1251 | return err; |
1252 | } | 1252 | } |
1253 | 1253 | ||
1254 | snd_card_set_dev(card, &pci->dev); | ||
1255 | |||
1256 | #ifdef CONFIG_SND_FM801_TEA575X_BOOL | 1254 | #ifdef CONFIG_SND_FM801_TEA575X_BOOL |
1257 | err = v4l2_device_register(&pci->dev, &chip->v4l2_dev); | 1255 | err = v4l2_device_register(&pci->dev, &chip->v4l2_dev); |
1258 | if (err < 0) { | 1256 | if (err < 0) { |
@@ -1312,7 +1310,8 @@ static int snd_card_fm801_probe(struct pci_dev *pci, | |||
1312 | return -ENOENT; | 1310 | return -ENOENT; |
1313 | } | 1311 | } |
1314 | 1312 | ||
1315 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); | 1313 | err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE, |
1314 | 0, &card); | ||
1316 | if (err < 0) | 1315 | if (err < 0) |
1317 | return err; | 1316 | return err; |
1318 | if ((err = snd_fm801_create(card, pci, tea575x_tuner[dev], radio_nr[dev], &chip)) < 0) { | 1317 | if ((err = snd_fm801_create(card, pci, tea575x_tuner[dev], radio_nr[dev], &chip)) < 0) { |