aboutsummaryrefslogtreecommitdiff
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-16 09:28:49 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-21 14:27:05 +0000
commite2adbecfcb08ae68e05d9a076b5d398cee939664 (patch)
treecb88a10669cd78716acb4c21b9e66187bc7e20a4 /drivers/pcmcia
parent65c77dcaa4d175194588cc829ccf0f1709f257c5 (diff)
downloadlinux-e2adbecfcb08ae68e05d9a076b5d398cee939664.tar.gz
PCMCIA: sa1111: jornada720: no need to disable IRQs around sa1111_set_io
sa1111_set_io() already contains the necessary locking within itself to safely change the state of a set of GPIOs. There's no need for callers to protect this by disabling IRQs themselves. Acked-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/sa1100_jornada720.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/pcmcia/sa1100_jornada720.c b/drivers/pcmcia/sa1100_jornada720.c
index 61b443e8e07..69428d1f5ae 100644
--- a/drivers/pcmcia/sa1100_jornada720.c
+++ b/drivers/pcmcia/sa1100_jornada720.c
@@ -78,13 +78,8 @@ jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s
}
ret = sa1111_pcmcia_configure_socket(skt, state);
- if (ret == 0) {
- unsigned long flags;
-
- local_irq_save(flags);
+ if (ret == 0)
sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set);
- local_irq_restore(flags);
- }
return ret;
}