thermal: Simplify or eliminate unnecessary set_mode() methods

Setting polling_delay is now done at thermal_core level (by not polling
DISABLED devices), so no need to repeat this code.

int340x: Checking for an impossible enum value is unnecessary.
acpi/thermal: It only prints debug messages.

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-11-andrzej.p@collabora.com

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 52b6cda..29a2b73 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -525,31 +525,6 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)
        return 0;
 }
 
-static int thermal_set_mode(struct thermal_zone_device *thermal,
-                               enum thermal_device_mode mode)
-{
-       struct acpi_thermal *tz = thermal->devdata;
-
-       if (!tz)
-               return -EINVAL;
-
-       if (mode != THERMAL_DEVICE_DISABLED &&
-           mode != THERMAL_DEVICE_ENABLED)
-               return -EINVAL;
-       /*
-        * enable/disable thermal management from ACPI thermal driver
-        */
-       if (mode == THERMAL_DEVICE_DISABLED)
-               pr_warn("thermal zone will be disabled\n");
-
-       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-               "%s kernel ACPI thermal control\n",
-               mode == THERMAL_DEVICE_ENABLED ?
-               "Enable" : "Disable"));
-
-       return 0;
-}
-
 static int thermal_get_trip_type(struct thermal_zone_device *thermal,
                                 int trip, enum thermal_trip_type *type)
 {
@@ -836,7 +811,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,
-       .set_mode = thermal_set_mode,
        .get_trip_type = thermal_get_trip_type,
        .get_trip_temp = thermal_get_trip_temp,
        .get_crit_temp = thermal_get_crit_temp,

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
index 4fb73d0..8fa286c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@ -275,19 +275,6 @@ static int mlxsw_thermal_unbind(struct thermal_zone_device *tzdev,
        return 0;
 }
 
-static int mlxsw_thermal_set_mode(struct thermal_zone_device *tzdev,
-                                 enum thermal_device_mode mode)
-{
-       struct mlxsw_thermal *thermal = tzdev->devdata;
-
-       if (mode == THERMAL_DEVICE_ENABLED)
-               tzdev->polling_delay = thermal->polling_delay;
-       else
-               tzdev->polling_delay = 0;
-
-       return 0;
-}
-
 static int mlxsw_thermal_get_temp(struct thermal_zone_device *tzdev,
                                  int *p_temp)
 {
@@ -387,7 +374,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,
-       .set_mode = mlxsw_thermal_set_mode,
        .get_temp = mlxsw_thermal_get_temp,
        .get_trip_type  = mlxsw_thermal_get_trip_type,
        .get_trip_temp  = mlxsw_thermal_get_trip_temp,
@@ -445,20 +431,6 @@ static int mlxsw_thermal_module_unbind(struct thermal_zone_device *tzdev,
        return err;
 }
 
-static int mlxsw_thermal_module_mode_set(struct thermal_zone_device *tzdev,
-                                        enum thermal_device_mode mode)
-{
-       struct mlxsw_thermal_module *tz = tzdev->devdata;
-       struct mlxsw_thermal *thermal = tz->parent;
-
-       if (mode == THERMAL_DEVICE_ENABLED)
-               tzdev->polling_delay = thermal->polling_delay;
-       else
-               tzdev->polling_delay = 0;
-
-       return 0;
-}
-
 static int mlxsw_thermal_module_temp_get(struct thermal_zone_device *tzdev,
                                         int *p_temp)
 {
@@ -574,7 +546,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,
-       .set_mode       = mlxsw_thermal_module_mode_set,
        .get_temp       = mlxsw_thermal_module_temp_get,
        .get_trip_type  = mlxsw_thermal_module_trip_type_get,
        .get_trip_temp  = mlxsw_thermal_module_trip_temp_get,
@@ -612,7 +583,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,
-       .set_mode       = mlxsw_thermal_module_mode_set,
        .get_temp       = mlxsw_thermal_gearbox_temp_get,
        .get_trip_type  = mlxsw_thermal_module_trip_type_get,
        .get_trip_temp  = mlxsw_thermal_module_trip_temp_get,

diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index 8fe0ecb..7632385 100644 (file)
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -397,8 +397,6 @@ static inline void acerhdf_revert_to_bios_mode(void)
 {
        acerhdf_change_fanstate(ACERHDF_FAN_AUTO);
        kernelmode = 0;
-       if (thz_dev)
-               thz_dev->polling_delay = 0;
 
        pr_notice("kernel mode fan control OFF\n");
 }
@@ -406,7 +404,6 @@ static inline void acerhdf_enable_kernelmode(void)
 {
        kernelmode = 1;
 
-       thz_dev->polling_delay = interval*1000;
        pr_notice("kernel mode fan control ON\n");
 }
 

diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 53abb1b..a023981 100644 (file)
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -338,9 +338,6 @@ static int imx_set_mode(struct thermal_zone_device *tz,
        const struct thermal_soc_data *soc_data = data->socdata;
 
        if (mode == THERMAL_DEVICE_ENABLED) {
-               tz->polling_delay = IMX_POLLING_DELAY;
-               tz->passive_delay = IMX_PASSIVE_DELAY;
-
                regmap_write(map, soc_data->sensor_ctrl + REG_CLR,
                             soc_data->power_down_mask);
                regmap_write(map, soc_data->sensor_ctrl + REG_SET,
@@ -356,9 +353,6 @@ static int imx_set_mode(struct thermal_zone_device *tz,
                regmap_write(map, soc_data->sensor_ctrl + REG_SET,
                             soc_data->power_down_mask);
 
-               tz->polling_delay = 0;
-               tz->passive_delay = 0;
-
                if (data->irq_enabled) {
                        disable_irq(data->irq);
                        data->irq_enabled = false;

diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
index 3c0397a..ce49d3b 100644 (file)
--- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
@@ -386,10 +386,6 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal,
        if (!priv)
                return -EINVAL;
 
-       if (mode != THERMAL_DEVICE_ENABLED &&
-           mode != THERMAL_DEVICE_DISABLED)
-               return -EINVAL;
-
        if (mode != thermal->mode)
                result = int3400_thermal_run_osc(priv->adev->handle,
                                                priv->current_uuid_index,

diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
index 43a516a..69ef12f 100644 (file)
--- a/drivers/thermal/thermal_of.c
+++ b/drivers/thermal/thermal_of.c
@@ -267,22 +267,6 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,
        return 0;
 }
 
-static int of_thermal_set_mode(struct thermal_zone_device *tz,
-                              enum thermal_device_mode mode)
-{
-       struct __thermal_zone *data = tz->devdata;
-
-       if (mode == THERMAL_DEVICE_ENABLED) {
-               tz->polling_delay = data->polling_delay;
-               tz->passive_delay = data->passive_delay;
-       } else {
-               tz->polling_delay = 0;
-               tz->passive_delay = 0;
-       }
-
-       return 0;
-}
-
 static int of_thermal_get_trip_type(struct thermal_zone_device *tz, int trip,
                                    enum thermal_trip_type *type)
 {
@@ -374,8 +358,6 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz,
 }
 
 static struct thermal_zone_device_ops of_thermal_ops = {
-       .set_mode = of_thermal_set_mode,
-
        .get_trip_type = of_thermal_get_trip_type,
        .get_trip_temp = of_thermal_get_trip_temp,
        .set_trip_temp = of_thermal_set_trip_temp,