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

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

gpio: omap: clean up edge interrupt handling 



The edge interrupt handling was effectively:

	isr = ISR_reg & enabled;
	if (bank->level_mask)
		level_mask = bank->level_mask & enabled;
	else
		level_mask = 0;

	edge = isr & ~level_mask;

When bank->level_mask is zero, level_mask will be computed as zero
anyway, so the if() statement is redundant.  We are then left with:

	isr = ISR_reg & enabled;
	level_mask = bank->level_mask & enabled;
	edge = isr & ~level_mask;

This can be simplified further to:

	isr = ISR_reg & enabled;
	edge = isr & ~bank->level_mask;

since the second mask with 'enabled' is redundant.

Improve the associated comment as well.

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 c030a9c9

drivers/gpio/gpio-omap.c

+9 −11
Original line number Original line Diff line number Diff line
@@ -733,7 +733,7 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) 
static irqreturn_t omap_gpio_irq_handler(int irq, void *gpiobank)

static irqreturn_t omap_gpio_irq_handler(int irq, void *gpiobank)

{

{

	void __iomem *isr_reg = NULL;

	void __iomem *isr_reg = NULL;

	u32 enabled, isr, level_mask;

	u32 enabled, isr, edge;

	unsigned int bit;

	unsigned int bit;

	struct gpio_bank *bank = gpiobank;

	struct gpio_bank *bank = gpiobank;

	unsigned long wa_lock_flags;

	unsigned long wa_lock_flags;
@@ -753,16 +753,14 @@ static irqreturn_t omap_gpio_irq_handler(int irq, void *gpiobank) 
		enabled = omap_get_gpio_irqbank_mask(bank);

		enabled = omap_get_gpio_irqbank_mask(bank);

		isr = readl_relaxed(isr_reg) & enabled;

		isr = readl_relaxed(isr_reg) & enabled;





		if (bank->level_mask)

		/*

			level_mask = bank->level_mask & enabled;

		 * Clear edge sensitive interrupts before calling handler(s)

		else

		 * so subsequent edge transitions are not missed while the

			level_mask = 0;

		 * handlers are running.



		 */

		/* clear edge sensitive interrupts before handler(s) are

		edge = isr & ~bank->level_mask;

		called so that we don't miss any interrupt occurred while

		if (edge)

		executing them */

			omap_clear_gpio_irqbank(bank, edge);

		if (isr & ~level_mask)

			omap_clear_gpio_irqbank(bank, isr & ~level_mask);





		raw_spin_unlock_irqrestore(&bank->lock, lock_flags);

		raw_spin_unlock_irqrestore(&bank->lock, lock_flags);