Re: [PATCH v3 3/3] hwmon: emc2305: Use devm_thermal_of_cooling_device_register

Guenter Roeck
2025-03-05T16:54:30Z

On 3/4/25 08:21, florin.leotescu@oss.nxp.com wrote:
> From: Florin Leotescu <florin.leotescu@nxp.com>
>
> This prepares emc2305 driver to use configuration from Device Tree nodes.
> Using devm_thermal_of_cooling_device_register also simplifies cleanup
> procedure, so we are able to remove the emc2305_unset_tz and emc2305_remove
> functions which are no longer used.
>
> Signed-off-by: Florin Leotescu <florin.leotescu@nxp.com>
> ---
> drivers/hwmon/emc2305.c | 28 +++-------------------------
> 1 file changed, 3 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/hwmon/emc2305.c b/drivers/hwmon/emc2305.c
> index a236f27c75bc..5f3f06308826 100644
> --- a/drivers/hwmon/emc2305.c
> +++ b/drivers/hwmon/emc2305.c
> @@ -112,8 +112,6 @@ static char *emc2305_fan_name[] = {
> "emc2305_fan5",
> };
>
> -static void emc2305_unset_tz(struct device *dev);
> -
> static int emc2305_get_max_channel(const struct emc2305_data *data)
> {
> return data->pwm_num;
> @@ -293,8 +291,9 @@ static int emc2305_set_single_tz(struct device *dev, int idx)
> pwm = data->pwm_min[cdev_idx];
>
> data->cdev_data[cdev_idx].cdev =
> - thermal_cooling_device_register(emc2305_fan_name[idx], data,
> - &emc2305_cooling_ops);
> + devm_thermal_of_cooling_device_register(dev, dev->of_node,
> + emc2305_fan_name[idx], data,
> + &emc2305_cooling_ops);
>
> if (IS_ERR(data->cdev_data[cdev_idx].cdev)) {
> dev_err(dev, "Failed to register cooling device %s\n", emc2305_fan_name[idx]);
> @@ -337,21 +336,9 @@ static int emc2305_set_tz(struct device *dev)
> return 0;
>
> thermal_cooling_device_register_fail:

This label is no longer necessary. Instead, any goto can be replaced with
an immediate return statement.

> - emc2305_unset_tz(dev);
> return ret;
> }
>
> -static void emc2305_unset_tz(struct device *dev)
> -{
> - struct emc2305_data *data = dev_get_drvdata(dev);
> - int i;
> -
> - /* Unregister cooling device. */
> - for (i = 0; i < EMC2305_PWM_MAX; i++)
> - if (data->cdev_data[i].cdev)
> - thermal_cooling_device_unregister(data->cdev_data[i].cdev);
> -}
> -
> static umode_t
> emc2305_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr, int channel)
> {
> @@ -599,14 +586,6 @@ static int emc2305_probe(struct i2c_client *client)
> return 0;
> }
>
> -static void emc2305_remove(struct i2c_client *client)
> -{
> - struct device *dev = &client->dev;
> -
> - if (IS_REACHABLE(CONFIG_THERMAL))
> - emc2305_unset_tz(dev);
> -}
> -
> static const struct of_device_id of_emc2305_match_table[] = {
> { .compatible = "microchip,emc2301", },
> { .compatible = "microchip,emc2302", },
> @@ -622,7 +601,6 @@ static struct i2c_driver emc2305_driver = {
> .of_match_table = of_emc2305_match_table,
> },
> .probe = emc2305_probe,
> - .remove = emc2305_remove,
> .id_table = emc2305_ids,
> };
>