iio: adc: xilinx-ams: Use devm_delayed_work_autocancel() to simplify code

Use devm_delayed_work_autocancel() instead of hand writing it. This is
less verbose and saves a few lines of code.

devm_delayed_work_autocancel() uses devm_add_action() instead of
devm_add_action_or_reset(). This is fine, because if the underlying memory
allocation fails, no work has been scheduled yet. So there is nothing to
undo.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/2626e6a057e40cd2271ef0e5f81d12e607bad5b4.1644776929.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/xilinx-ams.c b/drivers/iio/adc/xilinx-ams.c
index 8343c5f74121ec7f9baf6524a6268908894c80cd..6ffddf4038b84197b5f845f18799ea6cfe8e73b3 100644 (file)
--- a/drivers/iio/adc/xilinx-ams.c
+++ b/drivers/iio/adc/xilinx-ams.c
@@ -12,6 +12,7 @@
 #include <linux/bitfield.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
+#include <linux/devm-helpers.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
@@ -1348,11 +1349,6 @@ static void ams_clk_disable_unprepare(void *data)
        clk_disable_unprepare(data);
 }
 
-static void ams_cancel_delayed_work(void *data)
-{
-       cancel_delayed_work(data);
-}
-
 static int ams_probe(struct platform_device *pdev)
 {
        struct iio_dev *indio_dev;
@@ -1389,9 +1385,8 @@ static int ams_probe(struct platform_device *pdev)
        if (ret < 0)
                return ret;
 
-       INIT_DELAYED_WORK(&ams->ams_unmask_work, ams_unmask_worker);
-       ret = devm_add_action_or_reset(&pdev->dev, ams_cancel_delayed_work,
-                                      &ams->ams_unmask_work);
+       ret = devm_delayed_work_autocancel(&pdev->dev, &ams->ams_unmask_work,
+                                          ams_unmask_worker);
        if (ret < 0)
                return ret;