This makes it easy to grep :wakeup /proc/interrupts.

Cc: Andy Shevchenko <andriy.shevche...@linux.intel.com>
Cc: Brian Norris <briannor...@chromium.org>
Cc: Grygorii Strashko <grygorii.stras...@ti.com>
Cc: Ulf Hansson <ulf.hans...@linaro.org>
Suggested-by: Jeffy Chen <jeffy.c...@rock-chips.com>
Signed-off-by: Tony Lindgren <t...@atomide.com>
---
 drivers/base/power/power.h   |  1 +
 drivers/base/power/wakeirq.c | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -31,6 +31,7 @@ struct wake_irq {
        struct device *dev;
        unsigned int status;
        int irq;
+       char *name;
 };
 
 extern void dev_pm_arm_wake_irq(struct wake_irq *wirq);
diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c
--- a/drivers/base/power/wakeirq.c
+++ b/drivers/base/power/wakeirq.c
@@ -112,6 +112,7 @@ void dev_pm_clear_wake_irq(struct device *dev)
                free_irq(wirq->irq, wirq);
                wirq->status &= ~WAKE_IRQ_DEDICATED_MASK;
        }
+       kfree(wirq->name);
        kfree(wirq);
 }
 EXPORT_SYMBOL_GPL(dev_pm_clear_wake_irq);
@@ -184,6 +185,14 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int 
irq)
        if (!wirq)
                return -ENOMEM;
 
+       wirq->name = kasprintf(GFP_KERNEL, "%s:%s",
+                              dev_name(dev),
+                              "wakeup");
+       if (!wirq->name) {
+               err = -ENOMEM;
+               goto err_free;
+       }
+
        wirq->dev = dev;
        wirq->irq = irq;
        irq_set_status_flags(irq, IRQ_NOAUTOEN);
@@ -196,9 +205,9 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int 
irq)
         * so we use a threaded irq.
         */
        err = request_threaded_irq(irq, NULL, handle_threaded_wake_irq,
-                                  IRQF_ONESHOT, dev_name(dev), wirq);
+                                  IRQF_ONESHOT, wirq->name, wirq);
        if (err)
-               goto err_free;
+               goto err_free_name;
 
        err = dev_pm_attach_wake_irq(dev, irq, wirq);
        if (err)
@@ -210,6 +219,8 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int 
irq)
 
 err_free_irq:
        free_irq(irq, wirq);
+err_free_name:
+       kfree(wirq->name);
 err_free:
        kfree(wirq);
 
-- 
2.16.2

Reply via email to