aboutsummaryrefslogtreecommitdiff
path: root/drivers/pcmcia/soc_common.c
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2009-03-29 19:23:42 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2009-11-09 08:30:11 +0100
commitda4f007375197d6683461b995d404b01a7fdf2f5 (patch)
tree310c773abd405610c2dfcb952c1dead23885e6d9 /drivers/pcmcia/soc_common.c
parentbe85458edce0f165cff62622f5e73b1d17b1e228 (diff)
PCMCIA: soc_common: push socket probe down into SoC specific support
Move the individual socket probing and initialization down into the SoC specific support files, thereby allowing soc_common_drv_pcmcia_probe to be eliminated. soc_common.c now no longer deals with distinct groups of sockets. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/soc_common.c')
-rw-r--r--drivers/pcmcia/soc_common.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index fb5377d17af..6bc60f84a44 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -741,43 +741,6 @@ int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt)
}
EXPORT_SYMBOL(soc_pcmcia_add_one);
-int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops,
- struct skt_dev_info *sinfo)
-{
- struct soc_pcmcia_socket *skt;
- int ret, i;
-
- /*
- * Initialise the per-socket structure.
- */
- for (i = ret = 0; i < sinfo->nskt; i++) {
- skt = &sinfo->skt[i];
-
- skt->socket.owner = ops->owner;
- skt->socket.dev.parent = dev;
-
- skt->dev = dev;
- skt->ops = ops;
-
- ret = soc_pcmcia_add_one(skt);
- if (ret)
- break;
-
- WARN_ON(skt->socket.sock != i);
- }
-
- if (ret) {
- while (--i >= 0)
- soc_pcmcia_remove_one(&sinfo->skt[i]);
- kfree(sinfo);
- } else {
- dev_set_drvdata(dev, sinfo);
- }
-
- return ret;
-}
-EXPORT_SYMBOL(soc_common_drv_pcmcia_probe);
-
MODULE_AUTHOR("John Dorsey <john+@cs.cmu.edu>");
MODULE_DESCRIPTION("Linux PCMCIA Card Services: Common SoC support");
MODULE_LICENSE("Dual MPL/GPL");