diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-05-29 06:50:59 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-05-29 06:50:59 -0400 |
commit | f35e839a3ce730063174caaab8bf63432be553cf (patch) | |
tree | e7d070c6a87501af885452cf8dcf269e7f4c63eb | |
parent | 8b5a1f9c46c2b78716794b8762edf659ec25a87d (diff) |
ALSA: Remove the rest of *_set_drvdata(NULL) calls
A few calls are still left in parport drivers after this commit, which
I'm not quite sure yet.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/arm/aaci.c | 2 | ||||
-rw-r--r-- | sound/drivers/dummy.c | 1 | ||||
-rw-r--r-- | sound/parisc/harmony.c | 3 | ||||
-rw-r--r-- | sound/sparc/dbri.c | 2 | ||||
-rw-r--r-- | sound/spi/at73c213.c | 1 |
5 files changed, 0 insertions, 9 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index aa5d8034890b..1ca8dc2ccb89 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c | |||
@@ -1076,8 +1076,6 @@ static int aaci_remove(struct amba_device *dev) | |||
1076 | { | 1076 | { |
1077 | struct snd_card *card = amba_get_drvdata(dev); | 1077 | struct snd_card *card = amba_get_drvdata(dev); |
1078 | 1078 | ||
1079 | amba_set_drvdata(dev, NULL); | ||
1080 | |||
1081 | if (card) { | 1079 | if (card) { |
1082 | struct aaci *aaci = card->private_data; | 1080 | struct aaci *aaci = card->private_data; |
1083 | writel(0, aaci->base + AACI_MAINCR); | 1081 | writel(0, aaci->base + AACI_MAINCR); |
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index fd798f753609..11048cc744d0 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c | |||
@@ -1129,7 +1129,6 @@ static int snd_dummy_probe(struct platform_device *devptr) | |||
1129 | static int snd_dummy_remove(struct platform_device *devptr) | 1129 | static int snd_dummy_remove(struct platform_device *devptr) |
1130 | { | 1130 | { |
1131 | snd_card_free(platform_get_drvdata(devptr)); | 1131 | snd_card_free(platform_get_drvdata(devptr)); |
1132 | platform_set_drvdata(devptr, NULL); | ||
1133 | return 0; | 1132 | return 0; |
1134 | } | 1133 | } |
1135 | 1134 | ||
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index 0e66ba48d453..67f56a2cee6a 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c | |||
@@ -902,8 +902,6 @@ snd_harmony_free(struct snd_harmony *h) | |||
902 | if (h->iobase) | 902 | if (h->iobase) |
903 | iounmap(h->iobase); | 903 | iounmap(h->iobase); |
904 | 904 | ||
905 | parisc_set_drvdata(h->dev, NULL); | ||
906 | |||
907 | kfree(h); | 905 | kfree(h); |
908 | return 0; | 906 | return 0; |
909 | } | 907 | } |
@@ -1016,7 +1014,6 @@ static int | |||
1016 | snd_harmony_remove(struct parisc_device *padev) | 1014 | snd_harmony_remove(struct parisc_device *padev) |
1017 | { | 1015 | { |
1018 | snd_card_free(parisc_get_drvdata(padev)); | 1016 | snd_card_free(parisc_get_drvdata(padev)); |
1019 | parisc_set_drvdata(padev, NULL); | ||
1020 | return 0; | 1017 | return 0; |
1021 | } | 1018 | } |
1022 | 1019 | ||
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 75e6016d3efe..eee7afcae375 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
@@ -2670,8 +2670,6 @@ static int dbri_remove(struct platform_device *op) | |||
2670 | snd_dbri_free(card->private_data); | 2670 | snd_dbri_free(card->private_data); |
2671 | snd_card_free(card); | 2671 | snd_card_free(card); |
2672 | 2672 | ||
2673 | dev_set_drvdata(&op->dev, NULL); | ||
2674 | |||
2675 | return 0; | 2673 | return 0; |
2676 | } | 2674 | } |
2677 | 2675 | ||
diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c index a1a24b979ed2..8e3d9a6c7a3b 100644 --- a/sound/spi/at73c213.c +++ b/sound/spi/at73c213.c | |||
@@ -1070,7 +1070,6 @@ out: | |||
1070 | 1070 | ||
1071 | ssc_free(chip->ssc); | 1071 | ssc_free(chip->ssc); |
1072 | snd_card_free(card); | 1072 | snd_card_free(card); |
1073 | dev_set_drvdata(&spi->dev, NULL); | ||
1074 | 1073 | ||
1075 | return 0; | 1074 | return 0; |
1076 | } | 1075 | } |