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>

1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 0e35acb1366b..8a91106056fc 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -297,7 +297,16 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
 
 static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev)
 {
-        return soc_common_drv_pcmcia_remove(&dev->dev);
+        struct skt_dev_info *sinfo = platform_get_drvdata(dev);
+        int i;
+
+        platform_set_drvdata(dev, NULL);
+
+        for (i = 0; i < sinfo->nskt; i++)
+                soc_pcmcia_remove_one(&sinfo->skt[i]);
+
+        kfree(sinfo);
+        return 0;
 }
 
 static int pxa2xx_drv_pcmcia_suspend(struct device *dev)