UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Christophe JAILLET 2022-02-13 19:29:05 +01:00 committed by Jonathan Cameron
parent 2be8795a60
commit 2c43265516
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/iio/adc/xilinx-ams.c
View File

@ -12,6 +12,7 @@
#include <linux/bitfield.h> #include <linux/bitfield.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/devm-helpers.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>
@ -1348,11 +1349,6 @@ static void ams_clk_disable_unprepare(void *data)
clk_disable_unprepare(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) static int ams_probe(struct platform_device *pdev)
{ {
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
@ -1389,9 +1385,8 @@ static int ams_probe(struct platform_device *pdev)
if (ret < 0) if (ret < 0)
return ret; return ret;
INIT_DELAYED_WORK(&ams->ams_unmask_work, ams_unmask_worker); ret = devm_delayed_work_autocancel(&pdev->dev, &ams->ams_unmask_work,
ret = devm_add_action_or_reset(&pdev->dev, ams_cancel_delayed_work, ams_unmask_worker);
&ams->ams_unmask_work);
if (ret < 0) if (ret < 0)
return ret; return ret;