From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38F69C433E0 for ; Mon, 29 Jun 2020 21:43:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F272C206E9 for ; Mon, 29 Jun 2020 21:43:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=verdurent-com.20150623.gappssmtp.com header.i=@verdurent-com.20150623.gappssmtp.com header.b="yXWQZyxv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726982AbgF2Vng (ORCPT ); Mon, 29 Jun 2020 17:43:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727858AbgF2Sht (ORCPT ); Mon, 29 Jun 2020 14:37:49 -0400 Received: from mail-vs1-xe42.google.com (mail-vs1-xe42.google.com [IPv6:2607:f8b0:4864:20::e42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 445A5C00F83A for ; Mon, 29 Jun 2020 05:48:03 -0700 (PDT) Received: by mail-vs1-xe42.google.com with SMTP id p25so1362943vsg.4 for ; Mon, 29 Jun 2020 05:48:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=verdurent-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=sinEnS6z0XptgBEvEcK3MVQ+LTLUCuUM67IGB48+uOQ=; b=yXWQZyxv3Tuid2rMLdkiiqPqO771/LUhGpTuZO7tN1lCQvALpqAXD6QDLbcVJdR2DJ /NPqfsSrNnYOgvRHpQaNAZ4aqjyp4oHfKnfhjmq78WXV1756CXcVm/4dWP1AzJuA5/ox 7ywP5FU8VnODuq75PVQVtv6u5sRujs0EY8pIwLtzjNllqTpxdu6/FoOHTmQBWiC390jn Bcn1nz/GPyqqn5oBysRBz+SFvJwLZS7HNAF9/m+gIqbPsvCOfzMJIASBApYkdAR3eaU5 ogssMmkIDK2r6MXGaicZV0/WI5tfJ6n2VqmdQHmHpapNFZtQZ24bkM0owtL2IkL9jPv2 j2Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=sinEnS6z0XptgBEvEcK3MVQ+LTLUCuUM67IGB48+uOQ=; b=nrxVtc7qPawmsBWlCLVkqLi3xyfGJ4nQSEhgYe4lsMeX0ud3U0KqLvD/RXXmrCmDXp JKya8yYt8OAELw1+DYyntBfu5mI2UUP4WmX0argTS+oaB2Za7CwXnnlnvjxDlCq7eCky ZrfVi2mYEUhy3WfQ27PlAU+F31NB2eVlXeJvfPEjtWIc274i/yRwbtsImOARXowe6Tnq DBks/dHcRv5tuIUpfYJPnjmaFOc90HSwTiXcTg3xL/seJC6vjIuTaSHKGOqbxvIdog+w /TjDE6NhC1pU34cy8DXzUaG+wMIvRnsx6b8gyBepL0R3n/kU7XkNVv/hr8rbKD6q/wr9 wUzg== X-Gm-Message-State: AOAM532ZwBgYdPgcUi1bylPX8SCRw9sZoQKcba+xEpm9yA9hM2W6XQuI 0Ql/aKY1L//n0fIt2m91dBUMr5eN4JHLZKMv0dB9RA== X-Google-Smtp-Source: ABdhPJz5y4gYixUUu743AouZ4iPhyVkpUcLHjnbxyNRQtJI4Joc90JTCn7lsZ28Q7GeTrTlI2ZxCvGHDHBtVZEeY4WU= X-Received: by 2002:a67:7f04:: with SMTP id a4mr5835962vsd.9.1593434882284; Mon, 29 Jun 2020 05:48:02 -0700 (PDT) MIME-Version: 1.0 References: <20200629122925.21729-1-andrzej.p@collabora.com> <20200629122925.21729-11-andrzej.p@collabora.com> In-Reply-To: <20200629122925.21729-11-andrzej.p@collabora.com> From: Amit Kucheria Date: Mon, 29 Jun 2020 18:17:51 +0530 Message-ID: Subject: Re: [PATCH v7 10/11] thermal: Simplify or eliminate unnecessary set_mode() methods To: Andrzej Pietrasiewicz Cc: Linux PM list , linux-acpi@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, platform-driver-x86@vger.kernel.org, lakml , linux-renesas-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, "Rafael J . Wysocki" , Len Brown , Vishal Kulkarni , "David S . Miller" , Jiri Pirko , Ido Schimmel , Johannes Berg , Emmanuel Grumbach , Luca Coelho , Intel Linux Wireless , Kalle Valo , Peter Kaestle , Darren Hart , Andy Shevchenko , Sebastian Reichel , Miquel Raynal , Daniel Lezcano , Support Opensource , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , =?UTF-8?Q?Niklas_S=C3=B6derlund?= , Heiko Stuebner , Orson Zhai , Baolin Wang , Chunyan Zhang , Zhang Rui , Allison Randal , Enrico Weigelt , Gayatri Kammela , Thomas Gleixner , Bartlomiej Zolnierkiewicz , kernel@collabora.com Content-Type: text/plain; charset="UTF-8" Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Mon, Jun 29, 2020 at 6:00 PM Andrzej Pietrasiewicz wrote: > > 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 > [for acerhdf] > Acked-by: Peter Kaestle > Reviewed-by: Bartlomiej Zolnierkiewicz Reviewed-by: Amit Kucheria > --- > drivers/acpi/thermal.c | 26 ---------------- > .../ethernet/mellanox/mlxsw/core_thermal.c | 30 ------------------- > drivers/platform/x86/acerhdf.c | 3 -- > drivers/thermal/imx_thermal.c | 6 ---- > .../intel/int340x_thermal/int3400_thermal.c | 4 --- > drivers/thermal/thermal_of.c | 18 ----------- > 6 files changed, 87 deletions(-) > > diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c > index 52b6cda1bcc3..29a2b73fe035 100644 > --- 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 4fb73d0fd167..8fa286ccdd6b 100644 > --- 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 8fe0ecb6a626..76323855c80c 100644 > --- 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 53abb1be1cba..a02398118d88 100644 > --- 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 3c0397a29b8c..ce49d3b100d5 100644 > --- 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 43a516a35d64..69ef12f852b7 100644 > --- 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, > -- > 2.17.1 >