PCMCIA: sa1111: jornada720: no need to disable IRQs around sa1111_set_io
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 16 Jan 2012 09:28:49 +0000 (09:28 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 21 Feb 2012 14:27:05 +0000 (14:27 +0000)
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>
drivers/pcmcia/sa1100_jornada720.c

index 61b443e..69428d1 100644 (file)
@@ -78,13 +78,8 @@ jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s
        }
 
        ret = sa1111_pcmcia_configure_socket(skt, state);
        }
 
        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);
                sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set);
-               local_irq_restore(flags);
-       }
 
        return ret;
 }
 
        return ret;
 }