diff options
| author | Guenter Roeck | 2019-06-07 19:23:16 +0200 |
|---|---|---|
| committer | Guenter Roeck | 2019-06-24 03:33:01 +0200 |
| commit | 8e5e7ddd38b69ef48a2104cd663fab0e3dd03e14 (patch) | |
| tree | 88370763217f890960ef63c3c730a9212053706d /drivers/hwmon/max6650.c | |
| parent | hwmon: (core) Add comment describing how hwdev is freed in error path (diff) | |
| download | kernel-qcow2-linux-8e5e7ddd38b69ef48a2104cd663fab0e3dd03e14.tar.gz kernel-qcow2-linux-8e5e7ddd38b69ef48a2104cd663fab0e3dd03e14.tar.xz kernel-qcow2-linux-8e5e7ddd38b69ef48a2104cd663fab0e3dd03e14.zip | |
hwmon: (max6650) Use devm function to register thermal device
Use devm_thermal_of_cooling_device_register to register the thermal
cooling device. This lets us drop the remove function.
At the same time, use 'dev' variable in probe function consistently.
Cc: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/max6650.c')
| -rw-r--r-- | drivers/hwmon/max6650.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c index 6b9056f9483f..e540d0b0145e 100644 --- a/drivers/hwmon/max6650.c +++ b/drivers/hwmon/max6650.c @@ -101,7 +101,6 @@ module_param(clock, int, 0444); struct max6650_data { struct i2c_client *client; const struct attribute_group *groups[3]; - struct thermal_cooling_device *cooling_dev; struct mutex update_lock; int nr_fans; char valid; /* zero until following fields are valid */ @@ -744,6 +743,7 @@ static const struct thermal_cooling_device_ops max6650_cooling_ops = { static int max6650_probe(struct i2c_client *client, const struct i2c_device_id *id) { + struct thermal_cooling_device *cooling_dev; struct device *dev = &client->dev; const struct of_device_id *of_id = of_match_device(of_match_ptr(max6650_dt_match), dev); @@ -780,28 +780,16 @@ static int max6650_probe(struct i2c_client *client, return err; #if IS_ENABLED(CONFIG_THERMAL) - data->cooling_dev = - thermal_of_cooling_device_register(client->dev.of_node, - client->name, data, - &max6650_cooling_ops); - if (IS_ERR(data->cooling_dev)) - dev_warn(&client->dev, - "thermal cooling device register failed: %ld\n", - PTR_ERR(data->cooling_dev)); + cooling_dev = devm_thermal_of_cooling_device_register(dev, dev->of_node, + client->name, data, &max6650_cooling_ops); + if (IS_ERR(cooling_dev)) { + dev_warn(dev, "thermal cooling device register failed: %ld\n", + PTR_ERR(cooling_dev)); + } #endif return 0; } -static int max6650_remove(struct i2c_client *client) -{ - struct max6650_data *data = i2c_get_clientdata(client); - - if (!IS_ERR(data->cooling_dev)) - thermal_cooling_device_unregister(data->cooling_dev); - - return 0; -} - static const struct i2c_device_id max6650_id[] = { { "max6650", 1 }, { "max6651", 4 }, @@ -815,7 +803,6 @@ static struct i2c_driver max6650_driver = { .of_match_table = of_match_ptr(max6650_dt_match), }, .probe = max6650_probe, - .remove = max6650_remove, .id_table = max6650_id, }; |