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: Andrzej Pietrasiewicz <andrzej.p@collabora.com> [for acerhdf] Acked-by: Peter Kaestle <peter@piie.net> Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20200629122925.21729-12-andrzej.p@collabora.com
This commit is contained in:
Родитель
5d7bd8aa7c
Коммит
f5e50bf4d3
|
@ -413,8 +413,8 @@ 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,
|
||||
enum thermal_device_mode mode)
|
||||
static int acerhdf_change_mode(struct thermal_zone_device *thermal,
|
||||
enum thermal_device_mode mode)
|
||||
{
|
||||
if (mode == THERMAL_DEVICE_DISABLED && kernelmode)
|
||||
acerhdf_revert_to_bios_mode();
|
||||
|
@ -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,
|
||||
|
|
|
@ -330,8 +330,8 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int imx_set_mode(struct thermal_zone_device *tz,
|
||||
enum thermal_device_mode mode)
|
||||
static int imx_change_mode(struct thermal_zone_device *tz,
|
||||
enum thermal_device_mode mode)
|
||||
{
|
||||
struct imx_thermal_data *data = tz->devdata;
|
||||
struct regmap *map = data->tempmon;
|
||||
|
@ -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);
|
||||
|
|
|
@ -377,8 +377,8 @@ static int int3400_thermal_get_temp(struct thermal_zone_device *thermal,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,
|
||||
enum thermal_device_mode mode)
|
||||
static int int3400_thermal_change_mode(struct thermal_zone_device *thermal,
|
||||
enum thermal_device_mode mode)
|
||||
{
|
||||
struct int3400_thermal_priv *priv = thermal->devdata;
|
||||
int result = 0;
|
||||
|
@ -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 = {
|
||||
|
|
|
@ -298,8 +298,8 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sys_set_mode(struct thermal_zone_device *tzd,
|
||||
enum thermal_device_mode mode)
|
||||
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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -76,7 +76,7 @@ struct thermal_zone_device_ops {
|
|||
struct thermal_cooling_device *);
|
||||
int (*get_temp) (struct thermal_zone_device *, int *);
|
||||
int (*set_trips) (struct thermal_zone_device *, int, int);
|
||||
int (*set_mode) (struct thermal_zone_device *,
|
||||
int (*change_mode) (struct thermal_zone_device *,
|
||||
enum thermal_device_mode);
|
||||
int (*get_trip_type) (struct thermal_zone_device *, int,
|
||||
enum thermal_trip_type *);
|
||||
|
|
Загрузка…
Ссылка в новой задаче