aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/cs423x
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-05-29 06:49:32 -0400
committerTakashi Iwai <tiwai@suse.de>2013-05-29 06:50:28 -0400
commit8b5a1f9c46c2b78716794b8762edf659ec25a87d (patch)
tree33c21c8d78f7ab36321fbe877f76c802de0a4aea /sound/isa/cs423x
parentd2c69807156b8c162ce3f1e37b220d03d57af063 (diff)
ALSA: ISA: Remove superfluous *_set_drvdata(NULL) calls
Similarly like the previous commit for PCI drivers, remove dev_set_drvdata(NULL) and pnp_set_drvdata(NULL) calls in ISA drivers now. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/cs423x')
-rw-r--r--sound/isa/cs423x/cs4231.c1
-rw-r--r--sound/isa/cs423x/cs4236.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index aa7a5d86e480..ba9a74eff3e0 100644
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -151,7 +151,6 @@ out: snd_card_free(card);
151static int snd_cs4231_remove(struct device *dev, unsigned int n) 151static int snd_cs4231_remove(struct device *dev, unsigned int n)
152{ 152{
153 snd_card_free(dev_get_drvdata(dev)); 153 snd_card_free(dev_get_drvdata(dev));
154 dev_set_drvdata(dev, NULL);
155 return 0; 154 return 0;
156} 155}
157 156
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 252e9fb37db3..69614acb2052 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -504,7 +504,6 @@ static int snd_cs423x_isa_remove(struct device *pdev,
504 unsigned int dev) 504 unsigned int dev)
505{ 505{
506 snd_card_free(dev_get_drvdata(pdev)); 506 snd_card_free(dev_get_drvdata(pdev));
507 dev_set_drvdata(pdev, NULL);
508 return 0; 507 return 0;
509} 508}
510 509
@@ -600,7 +599,6 @@ static int snd_cs423x_pnpbios_detect(struct pnp_dev *pdev,
600static void snd_cs423x_pnp_remove(struct pnp_dev *pdev) 599static void snd_cs423x_pnp_remove(struct pnp_dev *pdev)
601{ 600{
602 snd_card_free(pnp_get_drvdata(pdev)); 601 snd_card_free(pnp_get_drvdata(pdev));
603 pnp_set_drvdata(pdev, NULL);
604} 602}
605 603
606#ifdef CONFIG_PM 604#ifdef CONFIG_PM