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

thermal: remove get_mode() operation of drivers 



get_mode() is now redundant, as the state is stored in struct
thermal_zone_device.

Consequently the "mode" attribute in sysfs can always be visible, because
it is always possible to get the mode from struct tzd.

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-6-andrzej.p@collabora.com
parent 5a350665

drivers/acpi/thermal.c

+0 −9
Original line number Diff line number Diff line
@@ -525,14 +525,6 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp) 
	return 0;

}



static int thermal_get_mode(struct thermal_zone_device *thermal,

				enum thermal_device_mode *mode)

{

	*mode = thermal->mode;



	return 0;

}



static int thermal_set_mode(struct thermal_zone_device *thermal,

				enum thermal_device_mode mode)

{
@@ -847,7 +839,6 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { 
	.bind = acpi_thermal_bind_cooling_device,

	.unbind	= acpi_thermal_unbind_cooling_device,

	.get_temp = thermal_get_temp,

	.get_mode = thermal_get_mode,

	.set_mode = thermal_set_mode,

	.get_trip_type = thermal_get_trip_type,

	.get_trip_temp = thermal_get_trip_temp,

drivers/net/ethernet/mellanox/mlxsw/core_thermal.c

+0 −19
Original line number Diff line number Diff line
@@ -275,14 +275,6 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev, 
	return 0;

}



static int mlxsw_thermal_get_mode(struct thermal_zone_device *tzdev,

				  enum thermal_device_mode *mode)

{

	*mode = tzdev->mode;



	return 0;

}



static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,

				  enum thermal_device_mode mode)

{
@@ -402,7 +394,6 @@ static int mlxsw_thermal_trend_get(struct thermal_zone_device *tzdev, 
static struct thermal_zone_device_ops mlxsw_thermal_ops = {

	.bind = mlxsw_thermal_bind,

	.unbind = mlxsw_thermal_unbind,

	.get_mode = mlxsw_thermal_get_mode,

	.set_mode = mlxsw_thermal_set_mode,

	.get_temp = mlxsw_thermal_get_temp,

	.get_trip_type	= mlxsw_thermal_get_trip_type,
@@ -461,14 +452,6 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev, 
	return err;

}



static int mlxsw_thermal_module_mode_get(struct thermal_zone_device *tzdev,

					 enum thermal_device_mode *mode)

{

	*mode = tzdev->mode;



	return 0;

}



static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,

					 enum thermal_device_mode mode)

{
@@ -606,7 +589,6 @@ static int mlxsw_thermal_module_trend_get(struct thermal_zone_device *tzdev, 
static struct thermal_zone_device_ops mlxsw_thermal_module_ops = {

	.bind		= mlxsw_thermal_module_bind,

	.unbind		= mlxsw_thermal_module_unbind,

	.get_mode	= mlxsw_thermal_module_mode_get,

	.set_mode	= mlxsw_thermal_module_mode_set,

	.get_temp	= mlxsw_thermal_module_temp_get,

	.get_trip_type	= mlxsw_thermal_module_trip_type_get,
@@ -645,7 +627,6 @@ static int mlxsw_thermal_gearbox_temp_get(struct thermal_zone_device *tzdev, 
static struct thermal_zone_device_ops mlxsw_thermal_gearbox_ops = {

	.bind		= mlxsw_thermal_module_bind,

	.unbind		= mlxsw_thermal_module_unbind,

	.get_mode	= mlxsw_thermal_module_mode_get,

	.set_mode	= mlxsw_thermal_module_mode_set,

	.get_temp	= mlxsw_thermal_gearbox_temp_get,

	.get_trip_type	= mlxsw_thermal_module_trip_type_get,

drivers/platform/x86/acerhdf.c

+0 −12
Original line number Diff line number Diff line
@@ -413,17 +413,6 @@ static inline void acerhdf_enable_kernelmode(void) 
	pr_notice("kernel mode fan control ON\n");

}



static int acerhdf_get_mode(struct thermal_zone_device *thermal,

			    enum thermal_device_mode *mode)

{

	if (verbose)

		pr_notice("kernel mode fan control %d\n", kernelmode);



	*mode = thermal->mode;



	return 0;

}



/*

 * set operation mode;

 * enabled: the thermal layer of the kernel takes care about
@@ -490,7 +479,6 @@ static struct thermal_zone_device_ops acerhdf_dev_ops = { 
	.bind = acerhdf_bind,

	.unbind = acerhdf_unbind,

	.get_temp = acerhdf_get_ec_temp,

	.get_mode = acerhdf_get_mode,

	.set_mode = acerhdf_set_mode,

	.get_trip_type = acerhdf_get_trip_type,

	.get_trip_hyst = acerhdf_get_trip_hyst,

drivers/thermal/da9062-thermal.c

+0 −8
Original line number Diff line number Diff line
@@ -120,13 +120,6 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data) 
	return IRQ_HANDLED;

}



static int da9062_thermal_get_mode(struct thermal_zone_device *z,

				   enum thermal_device_mode *mode)

{

	*mode = z->mode;

	return 0;

}



static int da9062_thermal_get_trip_type(struct thermal_zone_device *z,

					int trip,

					enum thermal_trip_type *type)
@@ -179,7 +172,6 @@ static int da9062_thermal_get_temp(struct thermal_zone_device *z, 


static struct thermal_zone_device_ops da9062_thermal_ops = {

	.get_temp	= da9062_thermal_get_temp,

	.get_mode	= da9062_thermal_get_mode,

	.get_trip_type	= da9062_thermal_get_trip_type,

	.get_trip_temp	= da9062_thermal_get_trip_temp,

};

drivers/thermal/imx_thermal.c

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

}



static int imx_get_mode(struct thermal_zone_device *tz,

			enum thermal_device_mode *mode)

{

	*mode = tz->mode;



	return 0;

}



static int imx_set_mode(struct thermal_zone_device *tz,

			enum thermal_device_mode mode)

{
@@ -464,7 +456,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { 
	.bind = imx_bind,

	.unbind = imx_unbind,

	.get_temp = imx_get_temp,

	.get_mode = imx_get_mode,

	.set_mode = imx_set_mode,

	.get_trip_type = imx_get_trip_type,

	.get_trip_temp = imx_get_trip_temp,

CRA Git | Maintained and supported by SUSTech CRA and CCSE