Re: [PATCH] PM / wakeirq: Add wakeup name to dedicated wake irqs

[Rafael J. Wysocki]

On Fri, Feb 9, 2018 at 5:14 PM, Tony Lindgren <tony@xxxxxxxxxxx> wrote:
> This makes it easy to grep :wakeup /proc/interrupts.
>
> Cc: Brian Norris <briannorris@xxxxxxxxxxxx>
> Cc: Grygorii Strashko <grygorii.strashko@xxxxxx>
> Cc: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
> Suggested-by: Jeffy Chen <jeffy.chen@xxxxxxxxxxxxxx>
> Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
> ---
>  drivers/base/power/power.h   |  1 +
>  drivers/base/power/wakeirq.c | 18 +++++++++++++++---
>  2 files changed, 16 insertions(+), 3 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);
> @@ -175,7 +176,8 @@ static irqreturn_t handle_threaded_wake_irq(int irq, void *_wirq)
>  int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)
>  {
>         struct wake_irq *wirq;
> -       int err;
> +       int err, namelen;
> +       const char *postfix = ":wakeup";
>
>         if (irq < 0)
>                 return -EINVAL;
> @@ -184,6 +186,14 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)
>         if (!wirq)
>                 return -ENOMEM;
>
> +       namelen = strlen(dev_name(dev)) + strlen(postfix) + 1;
> +       wirq->name = kzalloc(namelen, GFP_KERNEL);
> +       if (!wirq->name) {
> +               err = -ENOMEM;
> +               goto err_free;
> +       }
> +
> +       snprintf(wirq->name, namelen, "%s%s", dev_name(dev), postfix);

As Andy said you can do

wirq->name = kasprintf(GFP_KERNEL, "%s:wakeup", dev_name(dev));
if (!wirq->name) {
        err = -ENOMEM;
        goto err_free;
}

here and it will allocate the buffer for you.