2022-02-19 19:00:32

by Christophe JAILLET

Subject: [PATCH] Input: da9063 - Use devm_delayed_work_autocancel()

Use devm_delayed_work_autocancel() instead of hand-writing it.
This saves a few lines of code.

Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/input/misc/da9063_onkey.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/input/misc/da9063_onkey.c b/drivers/input/misc/da9063_onkey.c
index 79851923ee57..b14a389600c9 100644
--- a/drivers/input/misc/da9063_onkey.c
+++ b/drivers/input/misc/da9063_onkey.c
@@ -4,6 +4,7 @@
* Copyright (C) 2015 Dialog Semiconductor Ltd.
*/

+#include <linux/devm-helpers.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/input.h>
@@ -182,13 +183,6 @@ static irqreturn_t da9063_onkey_irq_handler(int irq, void *data)
return IRQ_HANDLED;
}

-static void da9063_cancel_poll(void *data)
-{
- struct da9063_onkey *onkey = data;
-
- cancel_delayed_work_sync(&onkey->work);
-}
-
static int da9063_onkey_probe(struct platform_device *pdev)
{
struct da9063_onkey *onkey;
@@ -234,9 +228,8 @@ static int da9063_onkey_probe(struct platform_device *pdev)

input_set_capability(onkey->input, EV_KEY, KEY_POWER);

- INIT_DELAYED_WORK(&onkey->work, da9063_poll_on);
-
- error = devm_add_action(&pdev->dev, da9063_cancel_poll, onkey);
+ error = devm_delayed_work_autocancel(&pdev->dev, &onkey->work,
+ da9063_poll_on);
if (error) {
dev_err(&pdev->dev,
"Failed to add cancel poll action: %d\n",
--
2.32.0

2022-02-22 09:47:08

by Adam Thomson

Subject: RE: [PATCH] Input: da9063 - Use devm_delayed_work_autocancel()

On 18 February 2022 17:29, Christophe JAILLET wrote:

> Use devm_delayed_work_autocancel() instead of hand-writing it.
> This saves a few lines of code.
>
> Signed-off-by: Christophe JAILLET <[email protected]>

Reviewed-by: Adam Thomson <[email protected]>

2022-03-01 11:50:41

by Dmitry Torokhov

Subject: Re: [PATCH] Input: da9063 - Use devm_delayed_work_autocancel()

On Fri, Feb 18, 2022 at 06:29:13PM +0100, Christophe JAILLET wrote:
> Use devm_delayed_work_autocancel() instead of hand-writing it.
> This saves a few lines of code.
>
> Signed-off-by: Christophe JAILLET <[email protected]>

Applied, thank you.

--
Dmitry