leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PM / wakeirq: Add wakeup name to dedicated wake irqs

Browse Source 
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>
This commit is contained in:
Tony Lindgren 2018-02-08 08:30:10 -08:00 committed by Rafael J. Wysocki
parent 4a3928c6f8
commit da997b22c4
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/base/power/power.h
View File

@ -31,6 +31,7 @@ struct wake_irq {
struct device *dev; struct device *dev;
unsigned int status; unsigned int status;
int irq; int irq;
const char *name;
}; };
extern void dev_pm_arm_wake_irq(struct wake_irq *wirq); extern void dev_pm_arm_wake_irq(struct wake_irq *wirq);

13
drivers/base/power/wakeirq.c
View File

@ -112,6 +112,7 @@ void dev_pm_clear_wake_irq(struct device *dev)
free_irq(wirq->irq, wirq); free_irq(wirq->irq, wirq);
wirq->status &= ~WAKE_IRQ_DEDICATED_MASK; wirq->status &= ~WAKE_IRQ_DEDICATED_MASK;
} }
kfree(wirq->name);
kfree(wirq); kfree(wirq);
} }
EXPORT_SYMBOL_GPL(dev_pm_clear_wake_irq); 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) if (!wirq)
return -ENOMEM; return -ENOMEM;
wirq->name = kasprintf(GFP_KERNEL, "%s:wakeup", dev_name(dev));
if (!wirq->name) {
err = -ENOMEM;
goto err_free;
}
wirq->dev = dev; wirq->dev = dev;
wirq->irq = irq; wirq->irq = irq;
irq_set_status_flags(irq, IRQ_NOAUTOEN); 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. * so we use a threaded irq.
*/ */
err = request_threaded_irq(irq, NULL, handle_threaded_wake_irq, err = request_threaded_irq(irq, NULL, handle_threaded_wake_irq,
IRQF_ONESHOT, dev_name(dev), wirq); IRQF_ONESHOT, wirq->name, wirq);
if (err) if (err)
goto err_free; goto err_free_name;
err = dev_pm_attach_wake_irq(dev, irq, wirq); err = dev_pm_attach_wake_irq(dev, irq, wirq);
if (err) if (err)
@ -210,6 +217,8 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)
err_free_irq: err_free_irq:
free_irq(irq, wirq); free_irq(irq, wirq);
err_free_name:
kfree(wirq->name);
err_free: err_free:
kfree(wirq); kfree(wirq);