ARM: sa11x0: neponset: provide function to manipulate NCR_0

Rather than having direct register accesses to NCR_0 scattered amongst
the code, provide a function instead.  This contains the necessary
race protection for this platform, ensuring that updates to this
register are safe.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/pcmcia/sa1100_neponset.c b/drivers/pcmcia/sa1100_neponset.c
index c95639b5f2a0..4300a7fb3edb 100644
--- a/drivers/pcmcia/sa1100_neponset.c
+++ b/drivers/pcmcia/sa1100_neponset.c
@@ -94,12 +94,7 @@ neponset_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_sta
 
         ret = sa1111_pcmcia_configure_socket(skt, state);
         if (ret == 0) {
-                unsigned long flags;
-
-                local_irq_save(flags);
-                NCR_0 = (NCR_0 & ~ncr_mask) | ncr_set;
-
-                local_irq_restore(flags);
+                neponset_ncr_frob(ncr_mask, ncr_set);
                 sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set);
         }