Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0e881e2 authored by Russell King's avatar Russell King Committed by Linus Walleij
Browse files

gpio: omap: simplify bank->level_mask 



bank->level_mask is merely the bitwise or of the level detection
context which we have already read in this function.  Rather than
repeating additional reads, compute it from the values already
read.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8ba70595

drivers/gpio/gpio-omap.c

+3 −4
Original line number Diff line number Diff line
@@ -325,6 +325,9 @@ static inline void omap_set_gpio_trigger(struct gpio_bank *bank, int gpio, 
	bank->context.fallingdetect =

			readl_relaxed(bank->base + bank->regs->fallingdetect);



	bank->level_mask = bank->context.leveldetect0 |

			   bank->context.leveldetect1;



	if (likely(!(bank->non_wakeup_gpios & gpio_bit))) {

		omap_gpio_rmw(base, bank->regs->wkup_en, gpio_bit, trigger != 0);

		bank->context.wake_en =
@@ -344,10 +347,6 @@ static inline void omap_set_gpio_trigger(struct gpio_bank *bank, int gpio, 
		else

			bank->enabled_non_wakeup_gpios &= ~gpio_bit;

	}



	bank->level_mask =

		readl_relaxed(bank->base + bank->regs->leveldetect0) |

		readl_relaxed(bank->base + bank->regs->leveldetect1);

}



#ifdef CONFIG_ARCH_OMAP1