Commit f5e50bf4 authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Daniel Lezcano
Browse files

thermal: Rename set_mode() to change_mode() 



set_mode() is only called when tzd's mode is about to change. Actual
setting is performed in thermal_core, in thermal_zone_device_set_mode().
The meaning of set_mode() callback is actually to notify the driver about
the mode being changed and giving the driver a chance to oppose such
change.

To better reflect the purpose of the method rename it to change_mode()

Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@collabora.com>
[for acerhdf]
Acked-by: default avatarPeter Kaestle <peter@piie.net>
Reviewed-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: default avatarAmit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200629122925.21729-12-andrzej.p@collabora.com
parent 5d7bd8aa

drivers/platform/x86/acerhdf.c

+3 −3
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static inline void acerhdf_enable_kernelmode(void) 
 *          the temperature and the fan.

 * disabled: the BIOS takes control of the fan.

 */

static int acerhdf_set_mode(struct thermal_zone_device *thermal,

static int acerhdf_change_mode(struct thermal_zone_device *thermal,

			       enum thermal_device_mode mode)

{

	if (mode == THERMAL_DEVICE_DISABLED && kernelmode)
@@ -473,7 +473,7 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { 
	.bind = acerhdf_bind,

	.unbind = acerhdf_unbind,

	.get_temp = acerhdf_get_ec_temp,

	.set_mode = acerhdf_set_mode,

	.change_mode = acerhdf_change_mode,

	.get_trip_type = acerhdf_get_trip_type,

	.get_trip_hyst = acerhdf_get_trip_hyst,

	.get_trip_temp = acerhdf_get_trip_temp,

drivers/thermal/imx_thermal.c

+4 −4
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp) 
	return 0;

}



static int imx_set_mode(struct thermal_zone_device *tz,

static int imx_change_mode(struct thermal_zone_device *tz,

			   enum thermal_device_mode mode)

{

	struct imx_thermal_data *data = tz->devdata;
@@ -447,7 +447,7 @@ static struct thermal_zone_device_ops imx_tz_ops = { 
	.bind = imx_bind,

	.unbind = imx_unbind,

	.get_temp = imx_get_temp,

	.set_mode = imx_set_mode,

	.change_mode = imx_change_mode,

	.get_trip_type = imx_get_trip_type,

	.get_trip_temp = imx_get_trip_temp,

	.get_crit_temp = imx_get_crit_temp,
@@ -860,7 +860,7 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev) 
	 * Need to disable thermal sensor, otherwise, when thermal core

	 * try to get temperature before thermal sensor resume, a wrong

	 * temperature will be read as the thermal sensor is powered

	 * down. This is done in set_mode() operation called from

	 * down. This is done in change_mode() operation called from

	 * thermal_zone_device_disable()

	 */

	ret = thermal_zone_device_disable(data->tz);

drivers/thermal/intel/int340x_thermal/int3400_thermal.c

+3 −3
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal, 
	return 0;

}



static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,

static int int3400_thermal_change_mode(struct thermal_zone_device *thermal,

				       enum thermal_device_mode mode)

{

	struct int3400_thermal_priv *priv = thermal->devdata;
@@ -399,7 +399,7 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, 


static struct thermal_zone_device_ops int3400_thermal_ops = {

	.get_temp = int3400_thermal_get_temp,

	.set_mode = int3400_thermal_set_mode,

	.change_mode = int3400_thermal_change_mode,

};



static struct thermal_zone_params int3400_thermal_params = {

drivers/thermal/intel/intel_quark_dts_thermal.c

+3 −3
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd, 
	return 0;

}



static int sys_set_mode(struct thermal_zone_device *tzd,

static int sys_change_mode(struct thermal_zone_device *tzd,

			   enum thermal_device_mode mode)

{

	int ret;
@@ -319,7 +319,7 @@ static struct thermal_zone_device_ops tzone_ops = { 
	.get_trip_type = sys_get_trip_type,

	.set_trip_temp = sys_set_trip_temp,

	.get_crit_temp = sys_get_crit_temp,

	.set_mode = sys_set_mode,

	.change_mode = sys_change_mode,

};



static void free_soc_dts(struct soc_sensor_entry *aux_entry)

drivers/thermal/thermal_core.c

+2 −2
Original line number Diff line number Diff line
@@ -482,8 +482,8 @@ static int thermal_zone_device_set_mode(struct thermal_zone_device *tz, 
		return ret;

	}



	if (tz->ops->set_mode)

		ret = tz->ops->set_mode(tz, mode);

	if (tz->ops->change_mode)

		ret = tz->ops->change_mode(tz, mode);



	if (!ret)

		tz->mode = mode;

CRA Git | Maintained and supported by SUSTech CRA and CCSE