PM / wakeirq: Add wakeup name to dedicated wake irqs

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

Suggested-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index 21244c53e377deb5af8f041cd72e7a2b19f4d485..86e67e70b509db7a4e5172bee308a425b212d20e 100644 (file)
--- 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;
+       const 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
index 6637fc319269ba9f93a4c7ae44422723656033c8..b8fa5c0f2d1325ba9238f219f7613e0751abef6b 100644 (file)
--- 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,12 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)
        if (!wirq)
                return -ENOMEM;
 
+       wirq->name = kasprintf(GFP_KERNEL, "%s:wakeup", dev_name(dev));
+       if (!wirq->name) {
+               err = -ENOMEM;
+               goto err_free;
+       }
+
        wirq->dev = dev;
        wirq->irq = irq;
        irq_set_status_flags(irq, IRQ_NOAUTOEN);
@@ -196,9 +203,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 +217,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);