niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

hwmon: (gpio-fan) Use devm_thermal_of_cooling_device_register

Browse source 
Call devm_thermal_of_cooling_device_register() to register the cooling
device. Also use devm_add_action_or_reset() to stop the fan on device
removal. This fixes a race condition since the fan was stopped before
the hwmon device was removed.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Guenter Roeck 2019-04-18 12:58:17 -07:00 • committed by Eduardo Valentin
parent 389c0ad1d6
commit 9534784550
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/hwmon/gpio-fan.c
View file

@ -498,6 +498,11 @@ static const struct of_device_id of_gpio_fan_match[] = {
}; };
MODULE_DEVICE_TABLE(of, of_gpio_fan_match); MODULE_DEVICE_TABLE(of, of_gpio_fan_match);
static void gpio_fan_stop(void *data)
{
set_fan_speed(data, 0);
}
static int gpio_fan_probe(struct platform_device *pdev) static int gpio_fan_probe(struct platform_device *pdev)
{ {
int err; int err;
@ -532,6 +537,7 @@ static int gpio_fan_probe(struct platform_device *pdev)
err = fan_ctrl_init(fan_data); err = fan_ctrl_init(fan_data);
if (err) if (err)
return err; return err;
devm_add_action_or_reset(dev, gpio_fan_stop, fan_data);
} }
/* Make this driver part of hwmon class. */ /* Make this driver part of hwmon class. */
@ -543,32 +549,20 @@ static int gpio_fan_probe(struct platform_device *pdev)
return PTR_ERR(fan_data->hwmon_dev); return PTR_ERR(fan_data->hwmon_dev);
/* Optional cooling device register for Device tree platforms */ /* Optional cooling device register for Device tree platforms */
fan_data->cdev = thermal_of_cooling_device_register(np, fan_data->cdev = devm_thermal_of_cooling_device_register(dev, np,
"gpio-fan", "gpio-fan", fan_data, &gpio_fan_cool_ops);
fan_data,
&gpio_fan_cool_ops);
dev_info(dev, "GPIO fan initialized\n"); dev_info(dev, "GPIO fan initialized\n");
return 0; return 0;
} }
static int gpio_fan_remove(struct platform_device *pdev) static void gpio_fan_shutdown(struct platform_device *pdev)
{ {
struct gpio_fan_data *fan_data = platform_get_drvdata(pdev); struct gpio_fan_data *fan_data = platform_get_drvdata(pdev);
if (!IS_ERR(fan_data->cdev))
thermal_cooling_device_unregister(fan_data->cdev);
if (fan_data->gpios) if (fan_data->gpios)
set_fan_speed(fan_data, 0); set_fan_speed(fan_data, 0);
return 0;
}
static void gpio_fan_shutdown(struct platform_device *pdev)
{
gpio_fan_remove(pdev);
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
@ -602,7 +596,6 @@ static SIMPLE_DEV_PM_OPS(gpio_fan_pm, gpio_fan_suspend, gpio_fan_resume);
static struct platform_driver gpio_fan_driver = { static struct platform_driver gpio_fan_driver = {
.probe = gpio_fan_probe, .probe = gpio_fan_probe,
.remove = gpio_fan_remove,
.shutdown = gpio_fan_shutdown, .shutdown = gpio_fan_shutdown,
.driver = { .driver = {
.name = "gpio-fan", .name = "gpio-fan",