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>

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index aa5d8034890b5f6d3fc7ede653862e17bf46b9db..1ca8dc2ccb89f21cb0d102d2d4cd4cc0c74e4bf0 100644 (file)
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -1076,8 +1076,6 @@ static int aaci_remove(struct amba_device *dev)
 {
        struct snd_card *card = amba_get_drvdata(dev);
 
-       amba_set_drvdata(dev, NULL);
-
        if (card) {
                struct aaci *aaci = card->private_data;
                writel(0, aaci->base + AACI_MAINCR);

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index fd798f753609c81a64e6391132d73543cfbf1761..11048cc744d0ef01034ce0a9aceb517ff202b5a5 100644 (file)
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -1129,7 +1129,6 @@ static int snd_dummy_probe(struct platform_device *devptr)
 static int snd_dummy_remove(struct platform_device *devptr)
 {
        snd_card_free(platform_get_drvdata(devptr));
-       platform_set_drvdata(devptr, NULL);
        return 0;
 }
 

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 0e66ba48d453fd9e81e431623320d8e86f3ad758..67f56a2cee6aec83bd4710f645a82cdca9e39847 100644 (file)
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -902,8 +902,6 @@ snd_harmony_free(struct snd_harmony *h)
        if (h->iobase)
                iounmap(h->iobase);
 
-       parisc_set_drvdata(h->dev, NULL);
-
        kfree(h);
        return 0;
 }
@@ -1016,7 +1014,6 @@ static int
 snd_harmony_remove(struct parisc_device *padev)
 {
        snd_card_free(parisc_get_drvdata(padev));
-       parisc_set_drvdata(padev, NULL);
        return 0;
 }
 

diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 75e6016d3efe79e0b025115f2f0148a9e3403aa3..eee7afcae37510db454f132c65f01ba5c34f776e 100644 (file)
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2670,8 +2670,6 @@ static int dbri_remove(struct platform_device *op)
        snd_dbri_free(card->private_data);
        snd_card_free(card);
 
-       dev_set_drvdata(&op->dev, NULL);
-
        return 0;
 }
 

diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c
index a1a24b979ed2799476e8962cd65908c6ca538c9f..8e3d9a6c7a3ba6e88f6cd29d0894a6c5a69162d7 100644 (file)
--- a/sound/spi/at73c213.c
+++ b/sound/spi/at73c213.c
@@ -1070,7 +1070,6 @@ out:
 
        ssc_free(chip->ssc);
        snd_card_free(card);
-       dev_set_drvdata(&spi->dev, NULL);
 
        return 0;
 }