diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-19 23:04:22 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 14:32:23 +0000 |
| commit | 81f33c65e6c09597e748288010476861ac5bd166 (patch) | |
| tree | fdc080d5d7ca25dfe4a033f31f419d8bb1124e7d /drivers/pcmcia/pxa2xx_lubbock.c | |
| parent | a9bb5a4bf9f84256499c802fd397d56d55227e4f (diff) | |
| download | op-kernel-dev-81f33c65e6c09597e748288010476861ac5bd166.zip op-kernel-dev-81f33c65e6c09597e748288010476861ac5bd166.tar.gz | |
PCMCIA: sa1111: use new per-socket irq/gpio infrastructure
Convert sa1111 PCMCIA drivers to use the new per-socket irq/gpio
infrastructure. As the core takes care of handling the IRQs, we
can get rid of sa1111_pcmcia_socket_init(), sa1111_pcmcia_socket_suspend(),
sa1111_pcmcia_hw_init() and sa1111_pcmcia_hw_shutdown(), as well
as the private IRQ table.
We remove the NCR_0 setting in Neponset, as this is duplicating
what's already done via configure_socket in suspend.
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia/pxa2xx_lubbock.c')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_lubbock.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/pxa2xx_lubbock.c index c21888e..c5caf57 100644 --- a/drivers/pcmcia/pxa2xx_lubbock.c +++ b/drivers/pcmcia/pxa2xx_lubbock.c @@ -202,7 +202,6 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, static struct pcmcia_low_level lubbock_pcmcia_ops = { .owner = THIS_MODULE, .configure_socket = lubbock_pcmcia_configure_socket, - .socket_init = sa1111_pcmcia_socket_init, .first = 0, .nr = 2, }; |
