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/maestro3.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/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, | |||
2693 | snd_m3_enable_ints(chip); | 2693 | snd_m3_enable_ints(chip); |
2694 | snd_m3_assp_continue(chip); | 2694 | snd_m3_assp_continue(chip); |
2695 | 2695 | ||
2696 | snd_card_set_dev(card, &pci->dev); | ||
2697 | |||
2698 | *chip_ret = chip; | 2696 | *chip_ret = chip; |
2699 | 2697 | ||
2700 | return 0; | 2698 | return 0; |
@@ -2721,7 +2719,8 @@ snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) | |||
2721 | return -ENOENT; | 2719 | return -ENOENT; |
2722 | } | 2720 | } |
2723 | 2721 | ||
2724 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); | 2722 | err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE, |
2723 | 0, &card); | ||
2725 | if (err < 0) | 2724 | if (err < 0) |
2726 | return err; | 2725 | return err; |
2727 | 2726 | ||