gpio/omap: remove extra context restores in *_runtime_resume()
authorTarun Kanti DebBarma <tarun.kanti@ti.com>
Thu, 4 Apr 2013 20:16:13 +0000 (15:16 -0500)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 10 Apr 2013 21:41:16 +0000 (23:41 +0200)
68942edb09f69b6e09522d1d346665eb3aadde49 (gpio/omap: fix wakeups
on level-triggered GPIOs) already restores the fallingdetect and
risingdetect contexts in *_runtime_resume(). These registers were
modified in *_runtime_suspend() to include even those configured
as level-triggered since only edge-triggered gpios can generate
wakeup events. Therefore, the old context restores of the same
registers present later in the code is not needed any more.
Remove them.

Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-omap.c

index 0de2e0d..405ce6f 100644 (file)
@@ -1292,10 +1292,6 @@ static int omap_gpio_runtime_resume(struct device *dev)
                return 0;
        }
 
-       __raw_writel(bank->context.fallingdetect,
-                       bank->base + bank->regs->fallingdetect);
-       __raw_writel(bank->context.risingdetect,
-                       bank->base + bank->regs->risingdetect);
        l = __raw_readl(bank->base + bank->regs->datain);
 
        /*