diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-05-29 06:37:32 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-05-29 06:37:32 -0400 |
commit | 20a24225d8f94fc56f74a9068684869d6deebea5 (patch) | |
tree | c7c78bc07df52098a3262942457a02a725cfd15b /sound/pci/rme9652 | |
parent | 4059a42c51f45566a7eb69f0c7af3ff65bee7a52 (diff) |
ALSA: PCI: Remove superfluous pci_set_drvdata(pci, NULL) at remove
As drvdata is cleared to NULL at probe failure or at removal by the
driver core, we don't have to call pci_set_drvdata(pci, NULL) any
longer in each driver.
The only remaining pci_set_drvdata(NULL) is in azx_firmware_cb() in
hda_intel.c. Since this function itself releases the card instance,
we need to clear drvdata here as well, so that it won't be released
doubly in the remove callback.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/rme9652')
-rw-r--r-- | sound/pci/rme9652/hdsp.c | 1 | ||||
-rw-r--r-- | sound/pci/rme9652/hdspm.c | 1 | ||||
-rw-r--r-- | sound/pci/rme9652/rme9652.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 94084cdb130c..4f255dfee450 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c | |||
@@ -5412,7 +5412,6 @@ static int snd_hdsp_probe(struct pci_dev *pci, | |||
5412 | static void snd_hdsp_remove(struct pci_dev *pci) | 5412 | static void snd_hdsp_remove(struct pci_dev *pci) |
5413 | { | 5413 | { |
5414 | snd_card_free(pci_get_drvdata(pci)); | 5414 | snd_card_free(pci_get_drvdata(pci)); |
5415 | pci_set_drvdata(pci, NULL); | ||
5416 | } | 5415 | } |
5417 | 5416 | ||
5418 | static struct pci_driver hdsp_driver = { | 5417 | static struct pci_driver hdsp_driver = { |
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 9ea05e956474..ef3cbc044f0c 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c | |||
@@ -6737,7 +6737,6 @@ static int snd_hdspm_probe(struct pci_dev *pci, | |||
6737 | static void snd_hdspm_remove(struct pci_dev *pci) | 6737 | static void snd_hdspm_remove(struct pci_dev *pci) |
6738 | { | 6738 | { |
6739 | snd_card_free(pci_get_drvdata(pci)); | 6739 | snd_card_free(pci_get_drvdata(pci)); |
6740 | pci_set_drvdata(pci, NULL); | ||
6741 | } | 6740 | } |
6742 | 6741 | ||
6743 | static struct pci_driver hdspm_driver = { | 6742 | static struct pci_driver hdspm_driver = { |
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index 773a67fff4cd..b96d9e1adf6d 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c | |||
@@ -2628,7 +2628,6 @@ static int snd_rme9652_probe(struct pci_dev *pci, | |||
2628 | static void snd_rme9652_remove(struct pci_dev *pci) | 2628 | static void snd_rme9652_remove(struct pci_dev *pci) |
2629 | { | 2629 | { |
2630 | snd_card_free(pci_get_drvdata(pci)); | 2630 | snd_card_free(pci_get_drvdata(pci)); |
2631 | pci_set_drvdata(pci, NULL); | ||
2632 | } | 2631 | } |
2633 | 2632 | ||
2634 | static struct pci_driver rme9652_driver = { | 2633 | static struct pci_driver rme9652_driver = { |