PM / wakeirq: Add wakeup name to dedicated wake irqs
Subsystems (4)
PATCH v2 1/1 PM / wakeirq: Add wakeup name to dedicated wake irqs
This makes it easy to grep :wakeup /proc/interrupts.
--- drivers/base/power/power.h | 1 + drivers/base/power/wakeirq.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-)
drivers/base/power/power.h +1 -0
@@ -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);
drivers/base/power/wakeirq.c +13 -2
@@ -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);
Signature · 1 line
2.16.2
drivers/base/power/power.h struct wake_irq { · line 34
Quoted 3 lines · Tony Lindgren
This makes it easy to grep :wakeup
/proc/interrupts.drivers/base/power/power.h +1
-0+char *name;
Wouldn't be const?
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Quoted 6 lines · Andy Shevchenko
Review
Quoted 3 lines · Tony Lindgren
This makes it easy to grep :wakeup
/proc/interrupts.(quoted diff) +1
-0+ char *name;Wouldn't be const?
Yup it can be const. And the kasprintf() can be made simpler as suggested earlier by Rafael. Here's v3 of the patch.
Thanks,
Tony
8< --------------------
Quoted 1 line
From tony Mon Sep 17 00:00:00 2001
From: Tony Lindgren <[email protected]>
Date: Thu, 8 Feb 2018 08:30:10 -0800
Subject: [PATCHv3] PM / wakeirq: Add wakeup name to dedicated wake irqs
This makes it easy to grep :wakeup /proc/interrupts.
--- drivers/base/power/power.h | 1 + drivers/base/power/wakeirq.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)
drivers/base/power/power.h +1 -0
@@ -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);
drivers/base/power/wakeirq.c +12 -2
@@ -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,13 @@ 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 +204,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 +218,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);
Signature · 1 line
2.16.2
Andy Shevchenko
Reviewed-bydrivers/base/power/wakeirq.c int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq) · line 189
Quoted 7 lines · Tony Lindgren
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Tony Lindgren
drivers/base/power/wakeirq.c +2
-0+ wirq->name =kasprintf (GFP_KERNEL ,"%s:wakeup" , +dev_name (dev));
Can it make one line?
In any case,
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Rafael J. Wysocki
maintainerQuoted 10 lines · Andy Shevchenko
drivers/base/power/wakeirq.c int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq) · line 189
Quoted 7 lines · Tony Lindgren
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Tony Lindgren
drivers/base/power/wakeirq.c +2
-0+ wirq->name =kasprintf (GFP_KERNEL ,"%s:wakeup" , +dev_name (dev));Can it make one line?
I can fix this up.
Quoted 3 lines
In any case,
Reviewed-by Andy Shevchenko <[email protected]>
I'll queue up the patch for 4.17 shortly.
Thanks!