plat-nomadik: fix compilation warning

The compiler warns that [rf]wimsc may be used uninitialized in
this function - the warning is actually false since the uses are
in identical if()-clauses, but it can't hurt very much to read
out the values to be modified early anyway and rid the warning.

Cc: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/plat-nomadik/gpio.c b/arch/arm/plat-nomadik/gpio.c
index 5e6653f..45b1cf9 100644 (file)
--- a/arch/arm/plat-nomadik/gpio.c
+++ b/arch/arm/plat-nomadik/gpio.c
@@ -134,15 +134,12 @@ static void __nmk_gpio_set_mode_safe(struct nmk_gpio_chip *nmk_chip,
                                     unsigned offset, int gpio_mode,
                                     bool glitch)
 {
-       u32 rwimsc;
-       u32 fwimsc;
+       u32 rwimsc = readl(nmk_chip->addr + NMK_GPIO_RWIMSC);
+       u32 fwimsc = readl(nmk_chip->addr + NMK_GPIO_FWIMSC);
 
        if (glitch && nmk_chip->set_ioforce) {
                u32 bit = BIT(offset);
 
-               rwimsc = readl(nmk_chip->addr + NMK_GPIO_RWIMSC);
-               fwimsc = readl(nmk_chip->addr + NMK_GPIO_FWIMSC);
-
                /* Prevent spurious wakeups */
                writel(rwimsc & ~bit, nmk_chip->addr + NMK_GPIO_RWIMSC);
                writel(fwimsc & ~bit, nmk_chip->addr + NMK_GPIO_FWIMSC);