Commit 96dc2b31 authored by Matti Vaittinen's avatar Matti Vaittinen Committed by Greg Kroah-Hartman
Browse files

hwmon: raspberry-pi: Clean-up few drivers by using managed work init 



Few drivers implement remove call-back only for ensuring a delayed
work gets cancelled prior driver removal. Clean-up these by switching
to use devm_delayed_work_autocancel() instead.

This change is compile-tested only. All testing is appreciated.

Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarMatti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Link: https://lore.kernel.org/r/4830f52d46278ea1c92ad7252f6050540346d8b7.1616506559.git.matti.vaittinen@fi.rohmeurope.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f94a5bec

drivers/hwmon/raspberrypi-hwmon.c

+6 −11
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * Copyright (C) 2018 Stefan Wahren <stefan.wahren@i2se.com>

 */

#include <linux/device.h>

#include <linux/devm-helpers.h>

#include <linux/err.h>

#include <linux/hwmon.h>

#include <linux/module.h>
@@ -106,6 +107,7 @@ static int rpi_hwmon_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct rpi_hwmon_data *data;

	int ret;



	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);

	if (!data)
@@ -119,7 +121,10 @@ static int rpi_hwmon_probe(struct platform_device *pdev) 
							       &rpi_chip_info,

							       NULL);



	INIT_DELAYED_WORK(&data->get_values_poll_work, get_values_poll);

	ret = devm_delayed_work_autocancel(dev, &data->get_values_poll_work,

					   get_values_poll);

	if (ret)

		return ret;

	platform_set_drvdata(pdev, data);



	if (!PTR_ERR_OR_ZERO(data->hwmon_dev))
@@ -128,18 +133,8 @@ static int rpi_hwmon_probe(struct platform_device *pdev) 
	return PTR_ERR_OR_ZERO(data->hwmon_dev);

}



static int rpi_hwmon_remove(struct platform_device *pdev)

{

	struct rpi_hwmon_data *data = platform_get_drvdata(pdev);



	cancel_delayed_work_sync(&data->get_values_poll_work);



	return 0;

}



static struct platform_driver rpi_hwmon_driver = {

	.probe = rpi_hwmon_probe,

	.remove = rpi_hwmon_remove,

	.driver = {

		.name = "raspberrypi-hwmon",

	},