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/emu10k1 | |
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/emu10k1')
-rw-r--r-- | sound/pci/emu10k1/emu10k1.c | 1 | ||||
-rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index 8c5010f7889c..9e1bd0c39a8c 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c | |||
@@ -202,7 +202,6 @@ static int snd_card_emu10k1_probe(struct pci_dev *pci, | |||
202 | static void snd_card_emu10k1_remove(struct pci_dev *pci) | 202 | static void snd_card_emu10k1_remove(struct pci_dev *pci) |
203 | { | 203 | { |
204 | snd_card_free(pci_get_drvdata(pci)); | 204 | snd_card_free(pci_get_drvdata(pci)); |
205 | pci_set_drvdata(pci, NULL); | ||
206 | } | 205 | } |
207 | 206 | ||
208 | 207 | ||
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index cdff11d48ebd..56ad9d6f200d 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -1623,7 +1623,6 @@ static int snd_emu10k1x_probe(struct pci_dev *pci, | |||
1623 | static void snd_emu10k1x_remove(struct pci_dev *pci) | 1623 | static void snd_emu10k1x_remove(struct pci_dev *pci) |
1624 | { | 1624 | { |
1625 | snd_card_free(pci_get_drvdata(pci)); | 1625 | snd_card_free(pci_get_drvdata(pci)); |
1626 | pci_set_drvdata(pci, NULL); | ||
1627 | } | 1626 | } |
1628 | 1627 | ||
1629 | // PCI IDs | 1628 | // PCI IDs |