[v3,19/20] GPIO: OMAP: optimize suspend and resume functions

Commit Message

Tarun Kanti DebBarma July 1, 2011, 9:47 a.m. UTC

There is no need to operate on all the banks every time the function is called.
Just operate on the current bank passed by the framework.

Signed-off-by: Tarun Kanti DebBarma <[e-mail]>
---
 drivers/gpio/gpio-omap.c |   56 ++++++++++++++++++++++-----------------------
 1 files changed, 27 insertions(+), 29 deletions(-)

Comments

Kevin Hilman July 6, 2011, 8:54 p.m. UTC | #1

Tarun Kanti DebBarma <[e-mail]> writes:

> There is no need to operate on all the banks every time the function is called.
> Just operate on the current bank passed by the framework.

That's a good change.

There is also no need to runtime suspend/resume the bank if
bank->suspend_wakeup == 0 during suspend (or bank->saved_wakeup == 0
during resume.)

IOW, banks with no wakeups enabled have an unnecessary runtime
resume/suspend in both the system suspend and resume path.

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Tarun Kanti DebBarma July 7, 2011, 4:42 a.m. UTC | #2

> -----Original Message-----
> From: Hilman, Kevin
> Sent: Thursday, July 07, 2011 2:25 AM
> To: DebBarma, Tarun Kanti
> Cc: [e-mail]; Shilimkar, Santosh; [e-mail]
> Subject: Re: [PATCH v3 19/20] GPIO: OMAP: optimize suspend and resume
> functions
> 
> Tarun Kanti DebBarma <[e-mail]> writes:
> 
> > There is no need to operate on all the banks every time the function is
> called.
> > Just operate on the current bank passed by the framework.
> 
> That's a good change.
> 
> There is also no need to runtime suspend/resume the bank if
> bank->suspend_wakeup == 0 during suspend (or bank->saved_wakeup == 0
> during resume.)
> 
> IOW, banks with no wakeups enabled have an unnecessary runtime
> resume/suspend in both the system suspend and resume path.
Ok, I will incorporate the change.
--
Tarun

> 
> Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 66eff1d..e9d2e1e 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1082,6 +1082,8 @@  static int __devinit omap_gpio_probe(struct platform_device *pdev)
 		goto err_free;
 	}
 
+	platform_set_drvdata(pdev, bank);
+
 	pm_runtime_enable(bank->dev);
 	pm_runtime_irq_safe(bank->dev);
 	if (IS_ERR_VALUE(pm_runtime_get_sync(bank->dev) < 0)) {
@@ -1114,26 +1116,24 @@  err_exit:
 
 static int omap_gpio_suspend(struct device *dev)
 {
-	struct gpio_bank *bank;
-
-	pm_runtime_get_sync(dev);
+	struct platform_device *pdev = to_platform_device(dev);
+	struct gpio_bank *bank = platform_get_drvdata(pdev);
+	void __iomem *base = bank->base;
+	void __iomem *wake_status;
+	unsigned long flags;
 
-	list_for_each_entry(bank, &omap_gpio_list, node) {
-		void __iomem *base = bank->base;
-		void __iomem *wake_status;
-		unsigned long flags;
+	if (!bank->regs->wkup_status)
+		return 0;
 
-		if (!bank->regs->wkup_status)
-			return 0;
+	wake_status = bank->base + bank->regs->wkup_status;
 
-		wake_status = bank->base + bank->regs->wkup_status;
+	pm_runtime_get_sync(dev);
 
-		spin_lock_irqsave(&bank->lock, flags);
-		bank->saved_wakeup = __raw_readl(wake_status);
-		MOD_REG_BIT(bank->regs->wkup_status, 0xffffffff, 0);
-		MOD_REG_BIT(bank->regs->wkup_status, bank->suspend_wakeup, 1);
-		spin_unlock_irqrestore(&bank->lock, flags);
-	}
+	spin_lock_irqsave(&bank->lock, flags);
+	bank->saved_wakeup = __raw_readl(wake_status);
+	MOD_REG_BIT(bank->regs->wkup_status, 0xffffffff, 0);
+	MOD_REG_BIT(bank->regs->wkup_status, bank->suspend_wakeup, 1);
+	spin_unlock_irqrestore(&bank->lock, flags);
 
 	pm_runtime_put_sync(dev);
 
@@ -1142,22 +1142,20 @@  static int omap_gpio_suspend(struct device *dev)
 
 static int omap_gpio_resume(struct device *dev)
 {
-	struct gpio_bank *bank;
+	struct platform_device *pdev = to_platform_device(dev);
+	struct gpio_bank *bank = platform_get_drvdata(pdev);
+	void __iomem *base = bank->base;
+	unsigned long flags;
 
-	pm_runtime_get_sync(dev);
+	if (!bank->regs->wkup_status)
+		return 0;
 
-	list_for_each_entry(bank, &omap_gpio_list, node) {
-		void __iomem *base = bank->base;
-		unsigned long flags;
-
-		if (!bank->regs->wkup_status)
-			return 0;
+	pm_runtime_get_sync(dev);
 
-		spin_lock_irqsave(&bank->lock, flags);
-		MOD_REG_BIT(bank->regs->wkup_status, 0xffffffff, 0);
-		MOD_REG_BIT(bank->regs->wkup_status, bank->saved_wakeup, 1);
-		spin_unlock_irqrestore(&bank->lock, flags);
-	}
+	spin_lock_irqsave(&bank->lock, flags);
+	MOD_REG_BIT(bank->regs->wkup_status, 0xffffffff, 0);
+	MOD_REG_BIT(bank->regs->wkup_status, bank->saved_wakeup, 1);
+	spin_unlock_irqrestore(&bank->lock, flags);
 
 	pm_runtime_put_sync(dev);