Skip to content

Commit

Permalink
ALSA: Remove the rest of *_set_drvdata(NULL) calls
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
tiwai committed May 29, 2013
1 parent 8b5a1f9 commit f35e839
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 9 deletions.
2 changes: 0 additions & 2 deletions sound/arm/aaci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion sound/drivers/dummy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
3 changes: 0 additions & 3 deletions sound/parisc/harmony.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 0 additions & 2 deletions sound/sparc/dbri.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/spi/at73c213.c
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,6 @@ static int snd_at73c213_remove(struct spi_device *spi)

ssc_free(chip->ssc);
snd_card_free(card);
dev_set_drvdata(&spi->dev, NULL);

return 0;
}
Expand Down

0 comments on commit f35e839

Please sign in to comment.