From patchwork Mon Feb 6 15:34:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 651191 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 572C2C636D4 for ; Mon, 6 Feb 2023 15:42:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229892AbjBFPmn (ORCPT ); Mon, 6 Feb 2023 10:42:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229768AbjBFPmN (ORCPT ); Mon, 6 Feb 2023 10:42:13 -0500 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22B996A4C for ; Mon, 6 Feb 2023 07:41:26 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id k13so3351172wrh.8 for ; Mon, 06 Feb 2023 07:41:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=j7HjN4TzQBq2ZZA76IO3M8MJUDcxOHaJ2gZPxRuGZEM=; b=lBPxmxlGU8fXgZEHTO0EE4dPwW1BhWuWnRA1kq0u1rwRukE654nexeKjDe8i554Nb5 /FqT7ZDXOA9tpzoFofMgM1evs8OaLAh9gOqtxXNDvjkflbB7L9t9ycnkEceeas6BY/4T xPBarlNgk0miyUUsa7afXR8FsMDAAvsfZfkZ5/bX71oYYx7QYE6TxT92vb84nlHoTpiy EhSsE5c7Mzk0THZ8+CaIQoH+w+RAK2i9kLYtygveAs4CNWPaHlq5codHe2FkuxZVTst2 4FFA0Odfv/klllyfbBxj6OYya8S5erlP9Td1/h4blF9Y2FCVAew913DqNGNgJQIN5SNb Rjbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=j7HjN4TzQBq2ZZA76IO3M8MJUDcxOHaJ2gZPxRuGZEM=; b=CCDUUKz3hR6QJZTU7yRUSqXnV+hVPBxBcn5fFg+zMN+zYrmNWsuSNWsEGqCTrrT3xt ix9MKoE32fHAa/NTpK+RgxV7qX7v8USJJ3g2DFTRAkMQv39oIKVjxS/4VB53EOMd6ddB 19CQJq6U9e9RjqWAqanHWuwMMSBapMjWUmEOrKsoKOgWPfl8PKtRDEIzD3KDHuFbE7z1 bbzEOAi9GlK47TFQkShNhbB18Ib113YU7OsoxtDHUyYn9UJB/oQLnwlmhrgHDhDkQhoV qvHEcKuI32RiSt/f5XNQqrtpsDPWdINEQ7VpdbpF3kCB9BvaxAif7snktqCN51P0Ld/8 ZKSg== X-Gm-Message-State: AO0yUKVA7mOJ3DFAC54svHMXsmcnrVI7mXMbdy7MbkHdIcmArwDMgoVi M6BWP6Vw98nvPulNRd1v1MsT8w== X-Google-Smtp-Source: AK7set9mPQd0MhkTQkAz8wEqWB2fDfP1ODpQprC+1QK0YualSEn/XjJWrwROk16wMPdL1WpD4j4sHw== X-Received: by 2002:adf:cc84:0:b0:2c3:e5d5:5d77 with SMTP id p4-20020adfcc84000000b002c3e5d55d77mr5118903wrj.68.1675697688552; Mon, 06 Feb 2023 07:34:48 -0800 (PST) Received: from mai.. (146725694.box.freepro.com. [130.180.211.218]) by smtp.gmail.com with ESMTPSA id a4-20020a5d5084000000b002c3db0eec5fsm7386805wrt.62.2023.02.06.07.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 07:34:48 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael.j.wysocki@intel.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Guillaume La Roque , "Rafael J. Wysocki" , Amit Kucheria , Zhang Rui , Miquel Raynal , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Andy Gross , Bjorn Andersson , Konrad Dybcio , Thara Gopinath , =?utf-8?q?Niklas_S=C3=B6derlund?= , Bartlomiej Zolnierkiewicz , Krzysztof Kozlowski , Alim Akhtar , Maxime Coquelin , Alexandre Torgue , Thierry Reding , Jonathan Hunter , Kunihiko Hayashi , Masami Hiramatsu , ye xingchen , Ricardo Neri , Srinivas Pandruvada , Haowen Bai , Minghao Chi , linux-amlogic@lists.infradead.org (open list:THERMAL DRIVER FOR AMLOGIC SOCS), linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-arm-msm@vger.kernel.org (open list:ARM/QUALCOMM SUPPORT), linux-renesas-soc@vger.kernel.org (open list:RENESAS R-CAR THERMAL DRIVERS), linux-samsung-soc@vger.kernel.org (open list:SAMSUNG THERMAL DRIVER), linux-stm32@st-md-mailman.stormreply.com (moderated list:ARM/STM32 ARCHITECTURE), linux-tegra@vger.kernel.org (open list:TEGRA ARCHITECTURE SUPPORT) Subject: [PATCH] thermal: Remove core header inclusion from drivers Date: Mon, 6 Feb 2023 16:34:29 +0100 Message-Id: <20230206153432.1017282-1-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org As the name states "thermal_core.h" is the header file for the core components of the thermal framework. Too many drivers are including it. Hopefully the recent cleanups helped to self encapsulate the code a bit more and prevented the drivers to need this header. Remove this inclusion in every place where it is possible. Some other drivers did a confusion with the core header and the one exported in linux/thermal.h. They include the former instead of the latter. The changes also fix this. The tegra/soctherm driver still remains as it uses an internal function which need to be replaced. The Intel HFI driver uses the netlink internal framework core and should be changed to prevent to deal with the internals. No functional changes [ Applies to thermal/linux-next or linux-pm/linux-next ] Signed-off-by: Daniel Lezcano Acked-by: Florian Fainelli # bcm2835_thermal.c Reviewed-by: Peng Fan for i.MX --- drivers/thermal/amlogic_thermal.c | 1 - drivers/thermal/armada_thermal.c | 2 -- drivers/thermal/broadcom/bcm2835_thermal.c | 1 - drivers/thermal/hisi_thermal.c | 3 +-- drivers/thermal/imx8mm_thermal.c | 1 - drivers/thermal/imx_sc_thermal.c | 1 - drivers/thermal/intel/intel_hfi.c | 3 ++- drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 1 - drivers/thermal/qoriq_thermal.c | 1 - drivers/thermal/rcar_gen3_thermal.c | 1 - drivers/thermal/samsung/exynos_tmu.c | 3 +-- drivers/thermal/st/stm_thermal.c | 1 - drivers/thermal/tegra/tegra30-tsensor.c | 1 - drivers/thermal/uniphier_thermal.c | 2 -- 14 files changed, 4 insertions(+), 18 deletions(-) diff --git a/drivers/thermal/amlogic_thermal.c b/drivers/thermal/amlogic_thermal.c index d30cb791e63c..9235fda4ec1e 100644 --- a/drivers/thermal/amlogic_thermal.c +++ b/drivers/thermal/amlogic_thermal.c @@ -28,7 +28,6 @@ #include #include -#include "thermal_core.h" #include "thermal_hwmon.h" #define TSENSOR_CFG_REG1 0x4 diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 83a4080bffc7..36653f692c80 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -19,8 +19,6 @@ #include #include -#include "thermal_core.h" - /* Thermal Manager Control and Status Register */ #define PMU_TDC0_SW_RST_MASK (0x1 << 1) #define PMU_TM_DISABLE_OFFS 0 diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c index 3d0710c6e004..23918bb76ae6 100644 --- a/drivers/thermal/broadcom/bcm2835_thermal.c +++ b/drivers/thermal/broadcom/bcm2835_thermal.c @@ -18,7 +18,6 @@ #include #include -#include "../thermal_core.h" #include "../thermal_hwmon.h" #define BCM2835_TS_TSENSCTL 0x00 diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index 45226cab466e..62c67942293e 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -16,8 +16,7 @@ #include #include #include - -#include "thermal_core.h" +#include #define HI6220_TEMP0_LAG (0x0) #define HI6220_TEMP0_TH (0x4) diff --git a/drivers/thermal/imx8mm_thermal.c b/drivers/thermal/imx8mm_thermal.c index d247b48696cb..72b5d6f319c1 100644 --- a/drivers/thermal/imx8mm_thermal.c +++ b/drivers/thermal/imx8mm_thermal.c @@ -17,7 +17,6 @@ #include #include -#include "thermal_core.h" #include "thermal_hwmon.h" #define TER 0x0 /* TMU enable */ diff --git a/drivers/thermal/imx_sc_thermal.c b/drivers/thermal/imx_sc_thermal.c index 378f574607f7..f32e59e74623 100644 --- a/drivers/thermal/imx_sc_thermal.c +++ b/drivers/thermal/imx_sc_thermal.c @@ -13,7 +13,6 @@ #include #include -#include "thermal_core.h" #include "thermal_hwmon.h" #define IMX_SC_MISC_FUNC_GET_TEMP 13 diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c index 6e604bda2b93..c69db6c90869 100644 --- a/drivers/thermal/intel/intel_hfi.c +++ b/drivers/thermal/intel/intel_hfi.c @@ -40,10 +40,11 @@ #include -#include "../thermal_core.h" #include "intel_hfi.h" #include "thermal_interrupt.h" +#include "../thermal_netlink.h" + /* Hardware Feedback Interface MSR configuration bits */ #define HW_FEEDBACK_PTR_VALID_BIT BIT(0) #define HW_FEEDBACK_CONFIG_HFI_ENABLE_BIT BIT(0) diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c index e2429676d0d2..101c75d0e13f 100644 --- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c +++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c @@ -15,7 +15,6 @@ #include #include -#include "../thermal_core.h" #include "../thermal_hwmon.h" #define QPNP_TM_REG_DIG_MAJOR 0x01 diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c index d111e218f362..431c29c0898a 100644 --- a/drivers/thermal/qoriq_thermal.c +++ b/drivers/thermal/qoriq_thermal.c @@ -13,7 +13,6 @@ #include #include -#include "thermal_core.h" #include "thermal_hwmon.h" #define SITES_MAX 16 diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c index 4ef927437842..0fd2fd077638 100644 --- a/drivers/thermal/rcar_gen3_thermal.c +++ b/drivers/thermal/rcar_gen3_thermal.c @@ -17,7 +17,6 @@ #include #include -#include "thermal_core.h" #include "thermal_hwmon.h" /* Register offsets */ diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 37465af59262..527d1eb0663a 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -20,11 +20,10 @@ #include #include #include +#include #include -#include "../thermal_core.h" - /* Exynos generic registers */ #define EXYNOS_TMU_REG_TRIMINFO 0x0 #define EXYNOS_TMU_REG_CONTROL 0x20 diff --git a/drivers/thermal/st/stm_thermal.c b/drivers/thermal/st/stm_thermal.c index e7834ccc7976..735401958f01 100644 --- a/drivers/thermal/st/stm_thermal.c +++ b/drivers/thermal/st/stm_thermal.c @@ -19,7 +19,6 @@ #include #include -#include "../thermal_core.h" #include "../thermal_hwmon.h" /* DTS register offsets */ diff --git a/drivers/thermal/tegra/tegra30-tsensor.c b/drivers/thermal/tegra/tegra30-tsensor.c index 0ffe37ce7df7..b3218b71b6d9 100644 --- a/drivers/thermal/tegra/tegra30-tsensor.c +++ b/drivers/thermal/tegra/tegra30-tsensor.c @@ -28,7 +28,6 @@ #include -#include "../thermal_core.h" #include "../thermal_hwmon.h" #define TSENSOR_SENSOR0_CONFIG0 0x0 diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c index f8ab2ca76184..47801841b3f5 100644 --- a/drivers/thermal/uniphier_thermal.c +++ b/drivers/thermal/uniphier_thermal.c @@ -17,8 +17,6 @@ #include #include -#include "thermal_core.h" - /* * block registers * addresses are the offset from .block_base