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

Commit 46748073 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by Linus Walleij
Browse files

gpio: omap: get rid of the conditional PM runtime calls 

OMAP GPIO driver is checking !BANK_USED() used condition before calling PM
runtime API, because of PM runtime calls in
omap2_gpio_prepare/resume_for_idle(). It's not required any more since
"omap gpio add level idle, cpu_pm and drop runtime_irq_safe" series [1]
from Tony Lindgren was accepted and PM runtime management was enabled in
IRQ chip core by commit be45beb2 ("genirq: Add runtime power management
support for IRQ chips") .

As result safely drop !BANK_USED() checks from omap_gpio_request/free(),
omap_gpio_irq_bus_lock/unlock() and enable PM runtime management for OMAP
GPIO IRQ chip.

[1] https://www.spinics.net/lists/arm-kernel/msg677583.html


Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8898240a

drivers/gpio/gpio-omap.c

+5 −20
Original line number Diff line number Diff line
@@ -704,11 +704,6 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset) 
	struct gpio_bank *bank = gpiochip_get_data(chip);

	unsigned long flags;



	/*

	 * If this is the first gpio_request for the bank,

	 * enable the bank module.

	 */

	if (!BANK_USED(bank))

	pm_runtime_get_sync(chip->parent);



	raw_spin_lock_irqsave(&bank->lock, flags);
@@ -733,11 +728,6 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) 
	omap_disable_gpio_module(bank, offset);

	raw_spin_unlock_irqrestore(&bank->lock, flags);



	/*

	 * If this is the last gpio to be freed in the bank,

	 * disable the bank module.

	 */

	if (!BANK_USED(bank))

	pm_runtime_put(chip->parent);

}
@@ -864,7 +854,6 @@ static void omap_gpio_irq_bus_lock(struct irq_data *data) 
{

	struct gpio_bank *bank = omap_irq_data_get_bank(data);



	if (!BANK_USED(bank))

	pm_runtime_get_sync(bank->chip.parent);

}
@@ -872,11 +861,6 @@ static void gpio_irq_bus_sync_unlock(struct irq_data *data) 
{

	struct gpio_bank *bank = omap_irq_data_get_bank(data);



	/*

	 * If this is the last IRQ to be freed in the bank,

	 * disable the bank module.

	 */

	if (!BANK_USED(bank))

	pm_runtime_put(bank->chip.parent);

}
@@ -1387,6 +1371,7 @@ static int omap_gpio_probe(struct platform_device *pdev) 
	irqc->irq_bus_sync_unlock = gpio_irq_bus_sync_unlock,

	irqc->name = dev_name(&pdev->dev);

	irqc->flags = IRQCHIP_MASK_ON_SUSPEND;

	irqc->parent_device = dev;



	bank->irq = platform_get_irq(pdev, 0);

	if (bank->irq <= 0) {