Commit 2115cbee authored by Florin Leotescu's avatar Florin Leotescu Committed by Guenter Roeck
Browse files

hwmon: emc2305: Use devm_thermal_of_cooling_device_register



Prepare the emc2305 driver to use configuration from Device Tree nodes.
Switch to devm_thermal_of_cooling_device_register to simplify the
cleanup procedure, allowing the removal of emc2305_unset_tz and
emc2305_remove, which are no longer needed.

Signed-off-by: default avatarFlorin Leotescu <florin.leotescu@nxp.com>
Reviewed-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20250321143308.4008623-4-florin.leotescu@oss.nxp.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 882bd6de
Loading
Loading
Loading
Loading
+4 −29
Original line number Diff line number Diff line
@@ -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,7 +291,8 @@ 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,
		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)) {
@@ -332,24 +331,9 @@ static int emc2305_set_tz(struct device *dev)
	for (i = 0; i < data->pwm_num; i++) {
		ret = emc2305_set_single_tz(dev, i + 1);
		if (ret)
			goto thermal_cooling_device_register_fail;
	}
	return 0;

thermal_cooling_device_register_fail:
	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);
	return 0;
}

static umode_t
@@ -599,14 +583,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,emc2305", },
	{},
@@ -619,7 +595,6 @@ static struct i2c_driver emc2305_driver = {
		.of_match_table = of_emc2305_match_table,
	},
	.probe = emc2305_probe,
	.remove	  = emc2305_remove,
	.id_table = emc2305_ids,
};