| Message ID | c670e963-0059-0da8-0273-ef0170fb769d@omp.ru (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [PATCH power core: wakeirq: kill useless parameter in dev_pm_attach_wake_irq() | expand |
On Thu, Sep 2, 2021 at 11:06 PM Sergey Shtylyov <s.shtylyov@omp.ru> wrote: > > This function has the 'irq' parameter which isn't ever used, so let's kill it. > > Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> > > --- > The patch is against the 'linux-next' branch of the Rafael J. Wysocki's > 'linux-=pm.git' repo. > > drivers/base/power/wakeirq.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > Index: linux-pm/drivers/base/power/wakeirq.c > =================================================================== > --- linux-pm.orig/drivers/base/power/wakeirq.c > +++ linux-pm/drivers/base/power/wakeirq.c > @@ -12,14 +12,11 @@ > /** > * dev_pm_attach_wake_irq - Attach device interrupt as a wake IRQ > * @dev: Device entry > - * @irq: Device wake-up capable interrupt > * @wirq: Wake irq specific data > * > - * Internal function to attach either a device IO interrupt or a > - * dedicated wake-up interrupt as a wake IRQ. > + * Internal function to attach a dedicated wake-up interrupt as a wake IRQ. > */ > -static int dev_pm_attach_wake_irq(struct device *dev, int irq, > - struct wake_irq *wirq) > +static int dev_pm_attach_wake_irq(struct device *dev, struct wake_irq *wirq) > { > unsigned long flags; > > @@ -65,7 +62,7 @@ int dev_pm_set_wake_irq(struct device *d > wirq->dev = dev; > wirq->irq = irq; > > - err = dev_pm_attach_wake_irq(dev, irq, wirq); > + err = dev_pm_attach_wake_irq(dev, wirq); > if (err) > kfree(wirq); > > @@ -196,7 +193,7 @@ int dev_pm_set_dedicated_wake_irq(struct > if (err) > goto err_free_name; > > - err = dev_pm_attach_wake_irq(dev, irq, wirq); > + err = dev_pm_attach_wake_irq(dev, wirq); > if (err) > goto err_free_irq; Applied as 5.15-rc material, but killing sounds brutal to me, so I've changed it to dropping in the subject and changelog. Thanks!
Index: linux-pm/drivers/base/power/wakeirq.c =================================================================== --- linux-pm.orig/drivers/base/power/wakeirq.c +++ linux-pm/drivers/base/power/wakeirq.c @@ -12,14 +12,11 @@ /** * dev_pm_attach_wake_irq - Attach device interrupt as a wake IRQ * @dev: Device entry - * @irq: Device wake-up capable interrupt * @wirq: Wake irq specific data * - * Internal function to attach either a device IO interrupt or a - * dedicated wake-up interrupt as a wake IRQ. + * Internal function to attach a dedicated wake-up interrupt as a wake IRQ. */ -static int dev_pm_attach_wake_irq(struct device *dev, int irq, - struct wake_irq *wirq) +static int dev_pm_attach_wake_irq(struct device *dev, struct wake_irq *wirq) { unsigned long flags; @@ -65,7 +62,7 @@ int dev_pm_set_wake_irq(struct device *d wirq->dev = dev; wirq->irq = irq; - err = dev_pm_attach_wake_irq(dev, irq, wirq); + err = dev_pm_attach_wake_irq(dev, wirq); if (err) kfree(wirq); @@ -196,7 +193,7 @@ int dev_pm_set_dedicated_wake_irq(struct if (err) goto err_free_name; - err = dev_pm_attach_wake_irq(dev, irq, wirq); + err = dev_pm_attach_wake_irq(dev, wirq); if (err) goto err_free_irq;
This function has the 'irq' parameter which isn't ever used, so let's kill it. Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> --- The patch is against the 'linux-next' branch of the Rafael J. Wysocki's 'linux-=pm.git' repo. drivers/base/power/wakeirq.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)