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/cmipci.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/cmipci.c')
-rw-r--r-- | sound/pci/cmipci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index 2755ec5bcc25..66c0558ce449 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c | |||
@@ -3254,8 +3254,6 @@ static int snd_cmipci_create(struct snd_card *card, struct pci_dev *pci, | |||
3254 | if (snd_cmipci_create_gameport(cm, dev) < 0) | 3254 | if (snd_cmipci_create_gameport(cm, dev) < 0) |
3255 | snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_JYSTK_EN); | 3255 | snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_JYSTK_EN); |
3256 | 3256 | ||
3257 | snd_card_set_dev(card, &pci->dev); | ||
3258 | |||
3259 | *rcmipci = cm; | 3257 | *rcmipci = cm; |
3260 | return 0; | 3258 | return 0; |
3261 | } | 3259 | } |
@@ -3280,7 +3278,8 @@ static int snd_cmipci_probe(struct pci_dev *pci, | |||
3280 | return -ENOENT; | 3278 | return -ENOENT; |
3281 | } | 3279 | } |
3282 | 3280 | ||
3283 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); | 3281 | err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE, |
3282 | 0, &card); | ||
3284 | if (err < 0) | 3283 | if (err < 0) |
3285 | return err; | 3284 | return err; |
3286 | 3285 | ||