diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-19 14:07:31 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 19:57:17 +0000 |
| commit | e0d21178ceb06f5bfa81a5697f68384f74af054a (patch) | |
| tree | 3ff7a16187d91c0e703f14ab9ea9d336719549d9 /drivers/pcmcia/sa11xx_base.c | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
| download | linux-3.10-e0d21178ceb06f5bfa81a5697f68384f74af054a.tar.gz linux-3.10-e0d21178ceb06f5bfa81a5697f68384f74af054a.tar.bz2 linux-3.10-e0d21178ceb06f5bfa81a5697f68384f74af054a.zip | |
PCMCIA: soc_common: move common initialization into soc_common
Move common socket initialization into soc_common.c.
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia/sa11xx_base.c')
| -rw-r--r-- | drivers/pcmcia/sa11xx_base.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c index 0c62fe31a40..a3ee89a6dd0 100644 --- a/drivers/pcmcia/sa11xx_base.c +++ b/drivers/pcmcia/sa11xx_base.c @@ -236,10 +236,7 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, skt = &sinfo->skt[i]; skt->nr = first + i; - skt->ops = ops; - skt->socket.owner = ops->owner; - skt->socket.dev.parent = dev; - skt->socket.pci_irq = NO_IRQ; + soc_pcmcia_init_one(skt, ops, dev); ret = sa11xx_drv_pcmcia_add_one(skt); if (ret) |