diff options
| author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2009-03-26 22:21:18 +0000 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-09 08:30:10 +0100 |
| commit | be85458edce0f165cff62622f5e73b1d17b1e228 (patch) | |
| tree | 01e3c995abab8f3533d2075d99f5a4a2d95e1948 /drivers/pcmcia/sa1111_generic.c | |
| parent | 097e296d6175881eba7244de7222de61e9569911 (diff) | |
| download | linux-stable-be85458edce0f165cff62622f5e73b1d17b1e228.tar.gz linux-stable-be85458edce0f165cff62622f5e73b1d17b1e228.tar.bz2 linux-stable-be85458edce0f165cff62622f5e73b1d17b1e228.zip | |
PCMCIA: soc_common: push socket removal down to SoC specific support
Mechanically transplant the removal code from soc_common into each
SoC specific base support file, thereby allowing
soc_common_drv_pcmcia_remove to be removed. No other changes.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/sa1111_generic.c')
| -rw-r--r-- | drivers/pcmcia/sa1111_generic.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 4be4e172ffa1..a6793e30cf71 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c @@ -152,7 +152,15 @@ static int pcmcia_probe(struct sa1111_dev *dev) static int __devexit pcmcia_remove(struct sa1111_dev *dev) { - soc_common_drv_pcmcia_remove(&dev->dev); + struct skt_dev_info *sinfo = dev_get_drvdata(&dev->dev); + int i; + + dev_set_drvdata(&dev->dev, NULL); + + for (i = 0; i < sinfo->nskt; i++) + soc_pcmcia_remove_one(&sinfo->skt[i]); + + kfree(sinfo); release_mem_region(dev->res.start, 512); return 0; } |