lkml.org 
[lkml]   [2015]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] drivers/power/wakeirq: Call device_init_wakeup from dev_pm_set_wake_irq
Date
The function dev_pm_set_wake_irq is typically called after device_init_wakeup.

Instead of summing a couple of call, let's call device_init_wakeup directly
from dev_pm_set_wake_irq / dev_pm_clear_wake_irq.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/base/power/wakeirq.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c
index eb6e674..287a021 100644
--- a/drivers/base/power/wakeirq.c
+++ b/drivers/base/power/wakeirq.c
@@ -60,8 +60,7 @@ static int dev_pm_attach_wake_irq(struct device *dev, int irq,
*
* Attach a device IO interrupt as a wake IRQ. The wake IRQ gets
* automatically configured for wake-up from suspend based
- * on the device specific sysfs wakeup entry. Typically called
- * during driver probe after calling device_init_wakeup().
+ * on the device specific sysfs wakeup entry.
*/
int dev_pm_set_wake_irq(struct device *dev, int irq)
{
@@ -75,9 +74,13 @@ int dev_pm_set_wake_irq(struct device *dev, int irq)
wirq->dev = dev;
wirq->irq = irq;

+ device_init_wakeup(dev, true);
+
err = dev_pm_attach_wake_irq(dev, irq, wirq);
- if (err)
+ if (!err) {
kfree(wirq);
+ device_init_wakeup(dev, false);
+ }

return err;
}
@@ -102,6 +105,7 @@ void dev_pm_clear_wake_irq(struct device *dev)
if (!wirq)
return;

+ device_init_wakeup(dev, false);
spin_lock_irqsave(&dev->power.lock, flags);
device_wakeup_detach_irq(dev);
dev->power.wakeirq = NULL;
--
1.9.1


\
 
 \ /
  Last update: 2015-09-01 17:21    [W:0.038 / U:2.572 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site