gpio: pl061: refactor type setting

Refactor this function so that I can understand it, do one
big read/modify/write operation and have the bitmask in a
variable instead of recalculating it every time it's needed.

Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Deepak Sikri <deepak.sikri@st.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index 93b51e339a27682944e620033cf598e25ddf427c..a934881279e8052ccc875e925a71d90e190e4d07 100644 (file)
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -150,6 +150,7 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger)
        int offset = irqd_to_hwirq(d);
        unsigned long flags;
        u8 gpiois, gpioibe, gpioiev;
+       u8 bit = BIT(offset);
 
        if (offset < 0 || offset >= PL061_GPIO_NR)
                return -EINVAL;
@@ -157,30 +158,31 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger)
        spin_lock_irqsave(&chip->lock, flags);
 
        gpioiev = readb(chip->base + GPIOIEV);
-
        gpiois = readb(chip->base + GPIOIS);
+       gpioibe = readb(chip->base + GPIOIBE);
+
        if (trigger & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) {
-               gpiois |= 1 << offset;
+               gpiois |= bit;
                if (trigger & IRQ_TYPE_LEVEL_HIGH)
-                       gpioiev |= 1 << offset;
+                       gpioiev |= bit;
                else
-                       gpioiev &= ~(1 << offset);
+                       gpioiev &= ~bit;
        } else
-               gpiois &= ~(1 << offset);
-       writeb(gpiois, chip->base + GPIOIS);
+               gpiois &= ~bit;
 
-       gpioibe = readb(chip->base + GPIOIBE);
        if ((trigger & IRQ_TYPE_EDGE_BOTH) == IRQ_TYPE_EDGE_BOTH)
-               gpioibe |= 1 << offset;
+               /* Setting this makes GPIOEV be ignored */
+               gpioibe |= bit;
        else {
-               gpioibe &= ~(1 << offset);
+               gpioibe &= ~bit;
                if (trigger & IRQ_TYPE_EDGE_RISING)
-                       gpioiev |= 1 << offset;
+                       gpioiev |= bit;
                else if (trigger & IRQ_TYPE_EDGE_FALLING)
-                       gpioiev &= ~(1 << offset);
+                       gpioiev &= ~bit;
        }
-       writeb(gpioibe, chip->base + GPIOIBE);
 
+       writeb(gpiois, chip->base + GPIOIS);
+       writeb(gpioibe, chip->base + GPIOIBE);
        writeb(gpioiev, chip->base + GPIOIEV);
 
        spin_unlock_irqrestore(&chip->lock, flags);