diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 14:20:19 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 11:17:52 +0100 |
| commit | 60c5772b50fe8ce947685cfe3a80b9bf6ea92831 (patch) | |
| tree | ad2d8a112bd708ff58f96ccb2ec7b15d88676379 /sound/pci/maestro3.c | |
| parent | ALSA: isa: Convert to snd_card_new() with a device pointer (diff) | |
| download | linux-60c5772b50fe8ce947685cfe3a80b9bf6ea92831.tar.xz linux-60c5772b50fe8ce947685cfe3a80b9bf6ea92831.zip | |
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/maestro3.c')
| -rw-r--r-- | sound/pci/maestro3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index d5417360f51f..076c3ec000c0 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c @@ -2693,8 +2693,6 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci, snd_m3_enable_ints(chip); snd_m3_assp_continue(chip); - snd_card_set_dev(card, &pci->dev); - *chip_ret = chip; return 0; @@ -2721,7 +2719,8 @@ snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) return -ENOENT; } - err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE, + 0, &card); if (err < 0) return err; |