Skip to contentSkip to conversation

drivers/power/wakeirq: Call device_init_wakeup from dev_pm_set_wake_irq

PATCH In review Daniel Lezcano 3 participants 3 messages Sep 1, 2015 – Sep 14, 2015

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/power/wakeirq: Call device_init_wakeup from dev_pm_set_wake_irq

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.

---
 drivers/base/power/wakeirq.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/base/power/wakeirq.c +7 -3
index eb6e674..287a021 100644
@@ -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;
Signature · 1 line
1.9.1
#1 lore raw
Quoted 6 lines · Daniel Lezcano

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.

If there are any existing callers of dev_pm_attach_wake_irq(), you need to update them too I think. Also, what if someone wants to use device_set_wakeup_capable() rather than device_init_wakeup()?

Quoted 42 lines
---
 drivers/base/power/wakeirq.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/base/power/wakeirq.c +7 -3
index eb6e674..287a021 100644
@@ -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;
Signature · 2 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
#2 lore raw
In reply to Daniel Lezcano

(+Tony in case he has any inputs)

Hi Daniel,

Quoted 25 lines · Daniel Lezcano

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.

---
  drivers/base/power/wakeirq.c | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
drivers/base/power/wakeirq.c +1 -2
index eb6e674..287a021 100644
@@ -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)
  {

drivers/base/power/wakeirq.c int dev_pm_set_wake_irq(struct device *dev, int irq) · line 78

Quoted 5 lines
drivers/base/power/wakeirq.c +2 -0
@@ -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);
+

IMO we can move this to dev_pm_attach_wake_irq, so that both dev_pm_set_dedicated_wake_irq and dev_pm_set_wake_irq are handled at one place.

Also the first user(drivers/i2c/i2c-core.c) of the API is added in v4.3-rc1. So you need to fix that as Rafael pointed out initially.

Regards,
Sudeep