From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 16 Jan 2012 09:28:49 +0000 (+0000)
Subject: PCMCIA: sa1111: jornada720: no need to disable IRQs around sa1111_set_io
X-Git-Tag: v3.4-rc1~103^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e2adbecfcb08ae68e05d9a076b5d398cee939664;p=karo-tx-linux.git

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>
---

diff --git a/drivers/pcmcia/sa1100_jornada720.c b/drivers/pcmcia/sa1100_jornada720.c
index 61b443e8e074..69428d1f5ae1 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;
 }