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/es1968.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/es1968.c')
-rw-r--r-- | sound/pci/es1968.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 772cc36f951d..87e9cd5d3ceb 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -2783,8 +2783,6 @@ static int snd_es1968_create(struct snd_card *card, | |||
2783 | return err; | 2783 | return err; |
2784 | } | 2784 | } |
2785 | 2785 | ||
2786 | snd_card_set_dev(card, &pci->dev); | ||
2787 | |||
2788 | #ifdef CONFIG_SND_ES1968_RADIO | 2786 | #ifdef CONFIG_SND_ES1968_RADIO |
2789 | /* don't play with GPIOs on laptops */ | 2787 | /* don't play with GPIOs on laptops */ |
2790 | if (chip->pci->subsystem_vendor != 0x125d) | 2788 | if (chip->pci->subsystem_vendor != 0x125d) |
@@ -2836,7 +2834,8 @@ static int snd_es1968_probe(struct pci_dev *pci, | |||
2836 | return -ENOENT; | 2834 | return -ENOENT; |
2837 | } | 2835 | } |
2838 | 2836 | ||
2839 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); | 2837 | err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE, |
2838 | 0, &card); | ||
2840 | if (err < 0) | 2839 | if (err < 0) |
2841 | return err; | 2840 | return err; |
2842 | 2841 | ||