projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pcmcia
/
sa11xx_base.c
diff --git
a/drivers/pcmcia/sa11xx_base.c
b/drivers/pcmcia/sa11xx_base.c
index 79ecc23643ecd8ec7ec6384b5798546295632648..6eecd7cddf5796b681b224e45a52a77476884d39 100644
(file)
--- a/
drivers/pcmcia/sa11xx_base.c
+++ b/
drivers/pcmcia/sa11xx_base.c
@@
-235,10
+235,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)