diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-05-29 14:37:32 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-05-29 14:37:32 +0400 |
| commit | 20a24225d8f94fc56f74a9068684869d6deebea5 (patch) | |
| tree | c7c78bc07df52098a3262942457a02a725cfd15b /sound/pci/ice1712 | |
| parent | 4059a42c51f45566a7eb69f0c7af3ff65bee7a52 (diff) | |
| download | linux-20a24225d8f94fc56f74a9068684869d6deebea5.tar.xz | |
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/ice1712')
| -rw-r--r-- | sound/pci/ice1712/ice1712.c | 1 | ||||
| -rw-r--r-- | sound/pci/ice1712/ice1724.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 806407a3973e..28ec872e54c0 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c @@ -2807,7 +2807,6 @@ static void snd_ice1712_remove(struct pci_dev *pci) if (ice->card_info && ice->card_info->chip_exit) ice->card_info->chip_exit(ice); snd_card_free(card); - pci_set_drvdata(pci, NULL); } static struct pci_driver ice1712_driver = { diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index ce70e7f113e0..500471778291 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c @@ -2800,7 +2800,6 @@ static void snd_vt1724_remove(struct pci_dev *pci) if (ice->card_info && ice->card_info->chip_exit) ice->card_info->chip_exit(ice); snd_card_free(card); - pci_set_drvdata(pci, NULL); } #ifdef CONFIG_PM_SLEEP |