summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/sa1111_generic.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-12-19 18:07:31 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-26 23:57:17 +0400
commite0d21178ceb06f5bfa81a5697f68384f74af054a (patch)
tree3ff7a16187d91c0e703f14ab9ea9d336719549d9 /drivers/pcmcia/sa1111_generic.c
parentdcd6c92267155e70a94b3927bce681ce74b80d1f (diff)
downloadlinux-e0d21178ceb06f5bfa81a5697f68384f74af054a.tar.xz
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/sa1111_generic.c')
-rw-r--r--drivers/pcmcia/sa1111_generic.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index 59866905ea37..7d6d3d423ef0 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -141,9 +141,7 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops,
return -ENOMEM;
s->soc.nr = ops->first + i;
- s->soc.ops = ops;
- s->soc.socket.owner = ops->owner;
- s->soc.socket.dev.parent = &dev->dev;
+ soc_pcmcia_init_one(&s->soc, ops, &dev->dev);
s->soc.socket.pci_irq = s->soc.nr ?
dev->irq[IDX_IRQ_S0_READY_NINT] :
dev->irq[IDX_IRQ_S1_READY_NINT];