From patchwork Tue Apr 2 16:12:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 161631 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1931638jan; Tue, 2 Apr 2019 09:13:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqxILstBPkGnaEdcm1Z/mbSrwcxjfdeJ8YHdTWDsus3I4UA8cKriTCptthaXn+34xQT4peoz X-Received: by 2002:a63:fe0a:: with SMTP id p10mr62349243pgh.86.1554221610275; Tue, 02 Apr 2019 09:13:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554221610; cv=none; d=google.com; s=arc-20160816; b=x6+sjmADQuVvOSOPpswX4vev4ekUWBhq3yC1tgoMA5mpuhrwEIt59NoSgoydqKKhbl 5jMMHFWjr1N3QxZDpaAjZYNoIpGqrk20895To55X8Q9gvbWdEV/uBy3cxdIL/ZAmwD72 PM1VGcQbbJZRT+K91rH86MWV2VkDI/nFZPejWvb3H32lT+rXajM/KZ8ELQbUw1mciFwe FxAd2A0NZAOupEo0U6G01nYqS/vtT4Z0h5/Nsx9Qad0jRX7cTEJ/FFiytYVESiiNGaBj 3GpV3DfsbMpYi249zSHXYkUQ72evczqMAeTl0H+NYPlFDX4N3LbEiZLPqi7rFsjau8Jr sysQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=xKY+ceGe4SnC6doIZkUhD6Dozc5uLu/ZgR2u3m//Do4=; b=H8qD3KCP4Fr9k//Iruyh0ntSU/lVhKO9nOZrxNbz1RDTvFab/LdcJWUTCKveNQ9HAK HXgstkJt/QXa7gOLK1LK6yWHB+f8dyVTF4GhxT6P21Xt8ZPGj3hE7RlohfDPdsELvemW eFAzQnFcULJkybZ3hExvB/z7Xogy/i4dIhMHNiXGVbH3/1M7qvvlEb2T2ShghrHyE0Dm sl3ooh/PvI1hdku07Y42w0VPYSzIBItXMT+AG8vsN7476h2qksIL1/X3AWAJ0SBFCqHv WrP+IB9LAM8Vf5UpEkn7/K+D2T7HSLxbrYaarJ7EuA6RCIzB7UByYAXfQjc7wKFZfjyq jZNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="FFy/4Wm+"; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q18si8871939pls.319.2019.04.02.09.13.29; Tue, 02 Apr 2019 09:13:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="FFy/4Wm+"; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729218AbfDBQN3 (ORCPT + 11 others); Tue, 2 Apr 2019 12:13:29 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:35292 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728741AbfDBQN2 (ORCPT ); Tue, 2 Apr 2019 12:13:28 -0400 Received: by mail-wm1-f65.google.com with SMTP id y197so4484811wmd.0 for ; Tue, 02 Apr 2019 09:13:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=xKY+ceGe4SnC6doIZkUhD6Dozc5uLu/ZgR2u3m//Do4=; b=FFy/4Wm+LurbVt0OXlOunKKi3T2Cm7VPBBPp4er2zxXCSFig3++1KgZ67Lc5P4SQZx PpQ+KNac1FSpIn9HYi0FW3hO6XWvHCMwyw03VFY4295APSPJGzFRIQltm2xvzp6jC6Q4 V5pjK8XvvlJgadjNwoCFISAkobOv9L54qyBmJu5lopHqR0D067HpOjDGTgJj4HQTFtIJ UFu+wHh34k0Kimu1DvxXhD0PtA2QUbQJ7nrbmjgdk+NwFAkZAlPXBBnHPv/vAkiNyyit omL4C9rI/LByQtXK7NTPYCLs43V8XSm6V4yBxzCRcWf0oTAN8+hJnFxUjDtP8qUtTN4S 9/lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xKY+ceGe4SnC6doIZkUhD6Dozc5uLu/ZgR2u3m//Do4=; b=g7thImjY5fLhltJbmzTAWFfkafd1e14v+bcwSgnEHMJ6Dk7g8oEl1h5VAy6uNE+www oKhriWIIot98Ch82EMU8+D37erxjgIMQwmyHoYWRmpqwAXSp1/oYufYiZ3/zYW5WWLpJ bErqCpOZVvWOqVzGE0jswtlOM4L8XvO1SdvIDrjUWzoHT8CSLYEoNXXKARb+y8phCGjC U0POuipEMsYRI8PXu1RHMtgiOtTOcNrSiHlFTFn971MKe62K555UVae3bM3T9QgJoSjf JnjAsqqbFgenfKEvFpTql2uU+HUeERBHHmTefk4akZoKpOs7laA0YHFo9K+1Nk88mHQW cV0Q== X-Gm-Message-State: APjAAAXI8k/m79wD6lxauxpTvdRQHEVTCCcXIt4x+M2C3zrH2Nlnq2NR v7D4Salr8Hh5D5fYVAYQRPHq7w== X-Received: by 2002:a1c:c18d:: with SMTP id r135mr4126832wmf.112.1554221606503; Tue, 02 Apr 2019 09:13:26 -0700 (PDT) Received: from mai.imgcgcw.net (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id a126sm17054999wmh.4.2019.04.02.09.13.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 09:13:25 -0700 (PDT) From: Daniel Lezcano To: rui.zhang@intel.com, edubezval@gmail.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck , Krzysztof Kozlowski , Russell King , Ralf Baechle , Paul Burton , James Hogan , Guan Xuetao , Andrew Morton , Alexey Brodkin , Robert Jarzmik , Arnd Bergmann , Enric Balletbo i Serra , Daniel Mack , linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT), linux-mips@vger.kernel.org (open list:MIPS) Subject: [PATCH 1/7] thermal/drivers/core: Remove the module Kconfig's option Date: Tue, 2 Apr 2019 18:12:44 +0200 Message-Id: <20190402161256.11044-1-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The module support for the thermal subsystem makes little sense: - some subsystems relying on it are not modules, thus forcing the framework to be compiled in - it is compiled in for almost every configs, the remaining ones are a few platforms where I don't see why we can not switch the thermal to 'y'. The drivers can stay in tristate. - platforms need the thermal to be ready as soon as possible at boot time in order to mitigate Usually the subsystems framework are compiled-in and the plugs are as module. Remove the module option. The removal of the module related dead code will come after this patch gets in or is acked. Signed-off-by: Daniel Lezcano Acked-by: Guenter Roeck For mini2440: Acked-by: Krzysztof Kozlowski --- arch/arm/configs/mini2440_defconfig | 2 +- arch/arm/configs/pxa_defconfig | 2 +- arch/mips/configs/ip22_defconfig | 2 +- arch/mips/configs/ip27_defconfig | 2 +- arch/unicore32/configs/unicore32_defconfig | 2 +- drivers/thermal/Kconfig | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) -- 2.17.1 Acked-by: Paul Burton # MIPS part Acked-by: Robert Jarzmik diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig index d95a8059d30b..0cf1c120c4bb 100644 --- a/arch/arm/configs/mini2440_defconfig +++ b/arch/arm/configs/mini2440_defconfig @@ -152,7 +152,7 @@ CONFIG_SPI_S3C24XX=y CONFIG_SPI_SPIDEV=y CONFIG_GPIO_SYSFS=y CONFIG_SENSORS_LM75=y -CONFIG_THERMAL=m +CONFIG_THERMAL=y CONFIG_WATCHDOG=y CONFIG_S3C2410_WATCHDOG=y CONFIG_FB=y diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index d4654755b09c..d4f9dda3a52f 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -387,7 +387,7 @@ CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_NTC_THERMISTOR=m -CONFIG_THERMAL=m +CONFIG_THERMAL=y CONFIG_WATCHDOG=y CONFIG_XILINX_WATCHDOG=m CONFIG_SA1100_WATCHDOG=m diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index ff40fbc2f439..21a1168ae301 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig @@ -228,7 +228,7 @@ CONFIG_SERIAL_IP22_ZILOG=m # CONFIG_HW_RANDOM is not set CONFIG_RAW_DRIVER=m # CONFIG_HWMON is not set -CONFIG_THERMAL=m +CONFIG_THERMAL=y CONFIG_WATCHDOG=y CONFIG_INDYDOG=m # CONFIG_VGA_CONSOLE is not set diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 81c47e18131b..54db5dedf776 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig @@ -271,7 +271,7 @@ CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_TAOS_EVM=m CONFIG_I2C_STUB=m # CONFIG_HWMON is not set -CONFIG_THERMAL=m +CONFIG_THERMAL=y CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m diff --git a/arch/unicore32/configs/unicore32_defconfig b/arch/unicore32/configs/unicore32_defconfig index aebd01fc28e5..360cc9abcdb0 100644 --- a/arch/unicore32/configs/unicore32_defconfig +++ b/arch/unicore32/configs/unicore32_defconfig @@ -119,7 +119,7 @@ CONFIG_I2C_PUV3=y # Hardware Monitoring support #CONFIG_SENSORS_LM75=m # Generic Thermal sysfs driver -#CONFIG_THERMAL=m +#CONFIG_THERMAL=y #CONFIG_THERMAL_HWMON=y # Multimedia support diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 653aa27a25a4..ccf5b9408d7a 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -3,7 +3,7 @@ # menuconfig THERMAL - tristate "Generic Thermal sysfs driver" + bool "Generic Thermal sysfs driver" help Generic Thermal Sysfs driver offers a generic mechanism for thermal management. Usually it's made up of one or more thermal @@ -11,7 +11,7 @@ menuconfig THERMAL Each thermal zone contains its own temperature, trip points, cooling devices. All platforms with ACPI thermal support can use this driver. - If you want this support, you should say Y or M here. + If you want this support, you should say Y here. if THERMAL From patchwork Tue Apr 2 16:12:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 161632 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1931718jan; Tue, 2 Apr 2019 09:13:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqxVXgHv213cqTCvdH5Y4tasb9JxtY9Xgv4nuBy4Vc3a6d11qYRO2VwdJ7PmU03Z30RJ9tdb X-Received: by 2002:a63:c118:: with SMTP id w24mr66783226pgf.67.1554221614576; Tue, 02 Apr 2019 09:13:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554221614; cv=none; d=google.com; s=arc-20160816; b=gaG0DN3CD+IJCQIxtK5dphXLebu15S03kW4aA/xdMqlN5/xXr3qMcsBbRWiZZFurrI G4W5U97lmml9xRDUZ113KJUWi39x2WT9NUfoSz+kSJZNo1Q1IKxDAgUYOFA6lzakO+qR oxbNV7WBt55ww1E+sAxFgC93vEF1Bs+WnR1nmV2d7NrTvQHUKNMmg/b9icKR2M5Q0S3w sAjhfTqX440+P2g4NNlPKQse7TJ+rD0geNNdh3puloN8EElRW+1azYFzUo6rr7DzNPOb eiFSfop3J89dd0TdAbOLhU/JgyP+mUEvbpagoysrmznWNjx8BhgdQgKeA3EqxyIhcglJ Nvag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=sM5DuO7BoO8bwUSi7V7hLCJ54rIkdF19j/mFFbs42Qg=; b=yaGVMggkhilBRxMYpUFE2oRlyqBVvv4YoQLQ9Cl42dwWu8p/G7i/YLo2eHh51Hk4bB tzBivVzkq604UV1xQRI4FpwwZlJgsYHMa6pygRQaeK7XztBXxNRqyFYD+tthTMffl1tF x1HO52rs0JJZZJsIpfQwtWn6UbadTUUJmjGreN6Fg/q7g2avyCCwiwtZsBAtLSYtYVLZ B0Uvlh9GalbcWVPhqQFNp6oBQrap41KC1SFX2eAFNSJ4LtX18WKYPOVk3Uz7V3oshdNJ Ubcex8LMBmJ1jRauXbJNbs6u64pC9TjHT1s7NHeqE9R0MBrb5eNoiFx/5RjMuww+KNZ/ 2gow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NlJ+caLw; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x9si4021926pgx.212.2019.04.02.09.13.34; Tue, 02 Apr 2019 09:13:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NlJ+caLw; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729823AbfDBQNd (ORCPT + 11 others); Tue, 2 Apr 2019 12:13:33 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39725 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729086AbfDBQNc (ORCPT ); Tue, 2 Apr 2019 12:13:32 -0400 Received: by mail-wm1-f67.google.com with SMTP id n25so4460168wmk.4 for ; Tue, 02 Apr 2019 09:13:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sM5DuO7BoO8bwUSi7V7hLCJ54rIkdF19j/mFFbs42Qg=; b=NlJ+caLw05rQVlBrMZ4YpruY+cDR62RpZb0YT/tqf6xKqrqIKusuVbvwpqeJMQbynC wGo/bK8lQxeaIVeVwlcpKXJEc0kIBtM2BictJ3Nkp+V3QLaZXvjVQbguauc/NLIaVaof xnC/CN2VVWdz3OYJgdJSh8A8me2k9BXhXJNjc7maXtyCaK3MPImHUceT23FuVwBxqeBD 0OENZnYQLPtAQagJPhvjfDXh1iVTzztiWMSnLyqn93yeHkYdSxJvDGAtyFEG9vNocshs iz08l1ytYZHjYc3HqwZqziTbTQzawBOx7q5DWtQrVdwbsMW6EDE5XHphmLn3sDch8Hje tY2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sM5DuO7BoO8bwUSi7V7hLCJ54rIkdF19j/mFFbs42Qg=; b=uHTNH0a6wlqi7MAGfPZoxQ46o/on0uEUrXTbnS3wnQV6Usz8mzi8J9zk0V/+9UHD4p 8B5SIvewACZzjITWfbDVoGDXhk02ydj5I2sgrFDjoKZdPSLxfdBBuDOCc3B+w7L825kN 2Wt5ahz+IiTSZOfV+ve6CS+ZBOAPnQ5XFsjFtAu2Zj4DleDELdoEf3WZ56imrXsKGKvR FrY6QWLJ33p7Z84Onlll2ctnOQutqgsSNLklU7qpejlFcMJryeEUwr+nTa0VrkYrmTHX jv9UqeFFnu37D/SbQQTvtpT2O+Tuw5EEJEV9c8wowvovSaz/5VsezBvM5JkadRv/OZDz JuZw== X-Gm-Message-State: APjAAAU+2JtplcNcGV7DtEOPodBXnbM9OtpVUKiGmbfFvDfYbeOxTkwd XC/kq2JI3zaFKYvZGJ6a+GQ9HrV5mXKRGQ== X-Received: by 2002:a7b:c155:: with SMTP id z21mr3380438wmi.1.1554221611184; Tue, 02 Apr 2019 09:13:31 -0700 (PDT) Received: from mai.imgcgcw.net (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id a126sm17054999wmh.4.2019.04.02.09.13.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 09:13:30 -0700 (PDT) From: Daniel Lezcano To: rui.zhang@intel.com, edubezval@gmail.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/7] thermal/drivers/core: Remove module unload code Date: Tue, 2 Apr 2019 18:12:45 +0200 Message-Id: <20190402161256.11044-2-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190402161256.11044-1-daniel.lezcano@linaro.org> References: <20190402161256.11044-1-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Now the thermal core is no longer compiled as a module. Remove the unloading module code and move the unregister function to the __init section. Signed-off-by: Daniel Lezcano --- drivers/thermal/thermal_core.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) -- 2.17.1 diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 6590bb5cb688..28f7ece0e8fe 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -266,7 +266,7 @@ static int __init thermal_register_governors(void) return thermal_gov_power_allocator_register(); } -static void thermal_unregister_governors(void) +static void __init thermal_unregister_governors(void) { thermal_gov_step_wise_unregister(); thermal_gov_fair_share_unregister(); @@ -1563,19 +1563,4 @@ static int __init thermal_init(void) mutex_destroy(&poweroff_lock); return result; } - -static void __exit thermal_exit(void) -{ - unregister_pm_notifier(&thermal_pm_nb); - of_thermal_destroy_zones(); - genetlink_exit(); - class_unregister(&thermal_class); - thermal_unregister_governors(); - ida_destroy(&thermal_tz_ida); - ida_destroy(&thermal_cdev_ida); - mutex_destroy(&thermal_list_lock); - mutex_destroy(&thermal_governor_lock); -} - fs_initcall(thermal_init); -module_exit(thermal_exit); From patchwork Tue Apr 2 16:12:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 161635 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1932231jan; Tue, 2 Apr 2019 09:14:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqyjdV2IMBNx0gjryZ+UT/690MlJhVDM49bZREHtg09BUgR0Ff0PWtA/g1xiNuXk6fUFt3xc X-Received: by 2002:a63:6a42:: with SMTP id f63mr41088285pgc.207.1554221641637; Tue, 02 Apr 2019 09:14:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554221641; cv=none; d=google.com; s=arc-20160816; b=yVHQ3nOZGLIVb8cgCNjax1SZRinPVh9pXfzSqKfc2k67kd+MaiBpSR2xRVVjYxg1m9 JFvR4hHJp9L9MRNM+IolkYJ/gr7ansyoFtl8G1r7PRaHFyhmMg+x/L/bxQJbgrKx4tC0 D3X5a2JX9c8m+lwWoP/LWE7rCvoSYf13Xax+qUqNAPAvaqIvsLfYKjTKyq2HWf6z5Fvn q+rcpF7AlX308Xbsu6nrnF04gCVDYyNeov27qFIhvTgVxQDSTtEOiSV8e32O5mSKDIMW UFmAi3LKAuBWFm/3DFW4GOISHXR30LeRwumi0gfJpXRG3CV0omFlUWyKS0ia1IocxGyL tJ2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=EpsrhrXs+dD79SXvH2cccWShrAxB04KkiEvgDMTNnaM=; b=sRQxroPzZKgPoPd3zIUYKuJhh0+DS6IEkwD9KHjPgA/k73Wopjg1OpAK5V4uZJHx0x IUp+B6U+WfHSdHmuKAGbFnHkq4aMKm9YwmiDNwH8YbYQK67UCxfLbiO1b3K8fG4j92Sp xkRwOwwBN0O7q5v0mlDlVrjT+SnID6A+NeL9QGAI7wiRLJUyLqO2Y605ZHllDMgp69H6 J3aKvqJe2lYBhQNIpSpcwU1Qa/s84hTSFXbqJ64BWWyazpXIC0qDIl1DgRXU4vVWJ1UA 1kfFV1b9j64EQ3ceV7Ag/VzAkrpj4LUXwXCpC6XiASuS8Y+qew/h0oKagyB/mQFr/ek/ /EwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YbW8teMW; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e36si11350805pgm.89.2019.04.02.09.14.01; Tue, 02 Apr 2019 09:14:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YbW8teMW; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729836AbfDBQOA (ORCPT + 11 others); Tue, 2 Apr 2019 12:14:00 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:39878 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729038AbfDBQOA (ORCPT ); Tue, 2 Apr 2019 12:14:00 -0400 Received: by mail-wr1-f67.google.com with SMTP id j9so17420084wrn.6 for ; Tue, 02 Apr 2019 09:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EpsrhrXs+dD79SXvH2cccWShrAxB04KkiEvgDMTNnaM=; b=YbW8teMWpb+FulYDEnukOhdz1UoCdasokDj1SgxZCIQcM/hCEnYtCStgdbU3an5U7K BQzbS7TqfD5ocAviTskX5VKV/1feBeXCVtSv4B95u3qxmrPTZxTqdFApp7j9r/upZqDw +oUbWSiGXoWv8ro6teeu+eOH/nc+GFtSXLnF9dBTE6ChT6KjGqQ31IRrES2K96PvIFMG hwKp+Xs4E/rDFnbwyaxiF5NhTbznGWORtj8ILS2n368EUDP8lxYaYPsEHhwMvAith9F6 J76Gdoau+5UYSoOYveapNBlyjciutzsI4wTfJgGUkQTLVbHqDbGxQEzZiC0GE/Mr5aGI 7Xng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EpsrhrXs+dD79SXvH2cccWShrAxB04KkiEvgDMTNnaM=; b=irE8WYbKpeqamP9Yp1GBrWdbKgYUclB5BdOaYWabiYiRiHN1LTAG9XQ+r7hNOEk1ea S6feWmMw3qc/oXUSaGZgMyNLGjJNueqqfPrqr6NB6Jl321tX288OnYuelwZlxfAlDHiA RNC6gCdHlnMmE1crYDJsg7AyJboXfauHBavmE4lcC/Hp4MMRxImaaveLwzSqwsgFJ69W h4W+KnlrRn+j7BzeMLjHY+hBnU52s6ct1DAOt0ZD8qB+tr8NZluuAAFNXOTGV/3+1U3g I6XL5IzkWkVL0mzU5LR7jJTdA5nqVwi5ZK9liSJJ/mM7XWWwSfhFr9WoC/k9MG8gVAx5 pVyw== X-Gm-Message-State: APjAAAUD4DVuDd5NOfOxCodHCbJ4hL2Po5YAcJVIEbgh9RlHuZ0p84Id RQeK1IRA1+tNqMKlww+s+bFVzA== X-Received: by 2002:a5d:43c9:: with SMTP id v9mr45200552wrr.269.1554221638711; Tue, 02 Apr 2019 09:13:58 -0700 (PDT) Received: from mai.imgcgcw.net (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id a126sm17054999wmh.4.2019.04.02.09.13.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 09:13:58 -0700 (PDT) From: Daniel Lezcano To: rui.zhang@intel.com, edubezval@gmail.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Gross , David Brown , Amit Kucheria , Stephen Rothwell , linux-arm-msm@vger.kernel.org (open list:ARM/QUALCOMM SUPPORT) Subject: [PATCH 5/7] thermal/drivers/core: Remove depends on THERMAL in Kconfig Date: Tue, 2 Apr 2019 18:12:48 +0200 Message-Id: <20190402161256.11044-5-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190402161256.11044-1-daniel.lezcano@linaro.org> References: <20190402161256.11044-1-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The dependency on the THERMAL option to be set is already there implicitly by the "if THERMAL" conditionnal option. The sub Kconfigs do not have to check against the THERMAL option as they are called from a Kconfig block which is enabled by the conditionnal option. Remove the useless "depends on THERMAL" in the Kconfigs. Signed-off-by: Daniel Lezcano --- drivers/thermal/Kconfig | 2 -- drivers/thermal/intel/Kconfig | 1 - drivers/thermal/qcom/Kconfig | 1 - 3 files changed, 4 deletions(-) -- 2.17.1 Reviewed-by: Amit Kucheria diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index ccf5b9408d7a..d8aa7fac8c56 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -24,7 +24,6 @@ config THERMAL_STATISTICS config THERMAL_EMERGENCY_POWEROFF_DELAY_MS int "Emergency poweroff delay in milli-seconds" - depends on THERMAL default 0 help Thermal subsystem will issue a graceful shutdown when @@ -152,7 +151,6 @@ config CPU_THERMAL bool "generic cpu cooling support" depends on CPU_FREQ depends on THERMAL_OF - depends on THERMAL=y help This implements the generic cpu cooling mechanism through frequency reduction. An ACPI version of this already exists diff --git a/drivers/thermal/intel/Kconfig b/drivers/thermal/intel/Kconfig index 2e013eeb4a1d..2c727a820759 100644 --- a/drivers/thermal/intel/Kconfig +++ b/drivers/thermal/intel/Kconfig @@ -1,6 +1,5 @@ config INTEL_POWERCLAMP tristate "Intel PowerClamp idle injection driver" - depends on THERMAL depends on X86 depends on CPU_SUP_INTEL help diff --git a/drivers/thermal/qcom/Kconfig b/drivers/thermal/qcom/Kconfig index cdb455ffd575..3ce20fec86a2 100644 --- a/drivers/thermal/qcom/Kconfig +++ b/drivers/thermal/qcom/Kconfig @@ -1,6 +1,5 @@ config QCOM_TSENS tristate "Qualcomm TSENS Temperature Alarm" - depends on THERMAL depends on QCOM_QFPROM depends on ARCH_QCOM || COMPILE_TEST help From patchwork Tue Apr 2 16:12:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 161636 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1932336jan; Tue, 2 Apr 2019 09:14:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqwBhMkJPx8bJBu4wqQBOBFXnWJCXKdAV/ZNeMNyOsZFYJ+3JJJRJcGaUo2myjtI4Yr94OPn X-Received: by 2002:a63:450f:: with SMTP id s15mr66537295pga.157.1554221647401; Tue, 02 Apr 2019 09:14:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554221647; cv=none; d=google.com; s=arc-20160816; b=AJg30wF1eoinE5tAqxCboGrkrEY9fuYN0aIfEAN8cjeiQfNokM4ihaUCkzKPfnx/zW HmdRyGU34HwjtHMUTfkCrPus4h2utpzoCcD2YR1p2OitaCEXcyVNsVIPpZhaMMXXW0Vk rQRZdLBoHh5g888nLlzXVMIAKXZ98GiXUL+6W7QwmHFcjAl3ERDJZ8TIFB5AKrIxGQw+ YlZcPq00vjfl6RhCaIW/XiUiBh8Iwn3tLSezWtzRY/DyLEn99WIbE/Lxh8YBIlfe1DUP dwkeIOpkAWKXfgyQ0uR80D4kNaVY9tdi0bgb6z8y6LM/tJcIteidyOdB9ooKAS6RTctq SoBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=0Cr9HTf+kNWrh6e/DF1i39MvM2+hXkkoSIyorjoDf6I=; b=d1u70Wbc7g7Jm3m9uVU71VJkVcBeK8Yl1tFZQOkd+gvqmvlCsi4s9NksNkr5XIYAGX jYrFI3PmUUoweROyoWvHKvJtoYcOPMKQ16DgrkdBarsUNnhvM/+x0IJj8LgB/PLylHVU tqlxFuSWtu7Dcc+vnPfGwMhb8gJCnrafMomKJ0oetbtM3atfNp/OcLr7S54r11CFZx7w /9iB/RVhhAbCgdimwMmP/8czytb/mZu/yjranktfcR3BdJEUWrhBDLBEiNuZw6WkYrKU xkJwUIButY+SrgTKOQ4qf2olpOfmGaqClOD3zDWpNaZmZ6t8uM8rHLZcoFwV29/XGIFO 8pog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R2faxDuY; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f2si11568532pgv.441.2019.04.02.09.14.07; Tue, 02 Apr 2019 09:14:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R2faxDuY; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730970AbfDBQOG (ORCPT + 11 others); Tue, 2 Apr 2019 12:14:06 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:45100 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729838AbfDBQOG (ORCPT ); Tue, 2 Apr 2019 12:14:06 -0400 Received: by mail-wr1-f65.google.com with SMTP id s15so17388386wra.12 for ; Tue, 02 Apr 2019 09:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0Cr9HTf+kNWrh6e/DF1i39MvM2+hXkkoSIyorjoDf6I=; b=R2faxDuYLS6/B2ZmwCj3GLJJRoKpQB8rXZA70X9KKEX/SgB5J44olq5NiENQZ4A6cN 1Cm8DIhzuKlV2Inh3tqRyXPZckAcBCiHsc6SU8eYfAlsHH9ZKEl6I0hjwhRv4qZzCRYi p0GB5nMLo1FerYpXq5O7yR7XByivsSRzuauZ7lMf3o66zyKtLBhyO1N/deaNSSBR4MjC y0IrXXxzrqyfhe1mqDVzakrGU1GaG1z2kEoE54u7GjCZJhIVu8lwHNO1+E6340TQM7A3 3KxJU87CMLoD7sacSfLq63pS5ZEvjhg9/j57/qyb1Gg5MlWvug6f0lRFiOvCV2xHZguA jw5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0Cr9HTf+kNWrh6e/DF1i39MvM2+hXkkoSIyorjoDf6I=; b=pEWXcCodxfBLQUzrfufFWwvfFcI4Zi8aYKN8ruduNi3hRxxylD4EcPkXh5y8Bk8jqD 6Uxvx3uB2a7ZndW+mdSMhZJBmn9UOhBrWrf/gfO0h7UhSHZ2MfrGztyepw4jGiQEfqJp uMMmqd4HeG0+i8y4tyX2iOA6TMoXLJnzqiKLIgFZ/kYwGcnpWb9tAyQNKTZq7QJ31I6n VoyMJ06BUbX42nqo66qjE6+tS2GCcEhSHeeZruw6iqZwumTJEZShXnxPKHSH8hBPsNmB 6iHNoLApA1r23R2VN1a5do0q8YOMHEOTNAVw1RqO0KuFnVXtmbPvLOOjQjW3Atn8pmFw fPlw== X-Gm-Message-State: APjAAAX6YP2nMNrxkKN5hAOOQYM2r+nyLMSl7U9fOepWTiWksO2fHdKq knpz9i8QNIvi4+ctOFbc1w5p7g== X-Received: by 2002:adf:de8d:: with SMTP id w13mr44731459wrl.26.1554221644717; Tue, 02 Apr 2019 09:14:04 -0700 (PDT) Received: from mai.imgcgcw.net (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id a126sm17054999wmh.4.2019.04.02.09.14.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 09:14:04 -0700 (PDT) From: Daniel Lezcano To: rui.zhang@intel.com, edubezval@gmail.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/7] thermal/drivers/core: Fix typo in the option name Date: Tue, 2 Apr 2019 18:12:49 +0200 Message-Id: <20190402161256.11044-6-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190402161256.11044-1-daniel.lezcano@linaro.org> References: <20190402161256.11044-1-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Unlike the other options, the cpu cooling option is beginning with a lowercase letter, changing to a uppercase. Signed-off-by: Daniel Lezcano --- drivers/thermal/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index d8aa7fac8c56..83e95a4fb61b 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -148,7 +148,7 @@ config THERMAL_GOV_POWER_ALLOCATOR allocating and limiting power to devices. config CPU_THERMAL - bool "generic cpu cooling support" + bool "Generic cpu cooling support" depends on CPU_FREQ depends on THERMAL_OF help From patchwork Tue Apr 2 16:12:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 161637 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1932508jan; Tue, 2 Apr 2019 09:14:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqyeoCYp9vKSa9JTSbUjZHVLktfP41ZD/oTVs5xeZCSM6UaZYSA7dJtKlzbczK7iuL6MjHtu X-Received: by 2002:a17:902:7590:: with SMTP id j16mr35590024pll.98.1554221655619; Tue, 02 Apr 2019 09:14:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554221655; cv=none; d=google.com; s=arc-20160816; b=e6EkpKS9cyfucCYhlFblZayqgaFHOFy926LA4Zq7Zg/9u1Lk3GgxD+I4hTuxoosZFW MhyEi/o3+LqkksZYxUhwcqDEhUUTn45VWjST87Se0bqHO0BGXgnpN1GVhZ3JaBqnJZ/h U93LuSMrVwxc0AiWDpYY/7cEfkPaGpq2Vg/BRMvnCr2Pq7WjPbUixDzhHjHtlhAtOAiN Usq5miHEKx4IOp3hRCxAAmJ+yQTWnyRyflShnX5knvTCATJq3DFtxH7GjYT++XCrv8/u KNsbuV5RcGqjNeBTg4r+Fp9BzZbUaTf0QpVykynTPlXzCIOCe0ROTNy7uP2i1wLfNXYm ShMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=HADuYtPTNrxpcN8kfE8Fku8tuLIuxpjkI5Oi1Be3G+o=; b=T8iemOPqtIyaUq6dX6zg+ekp6jpn/vTXIl/9dBvRKMMTFLX8CAik2vk0vtg532EEcM 8xfTBffnHrI/UzIz7vkIgrzXWSl2UrJJpG97wfLkUf8LbjHStwBxQfeEUrt78CplrqvL TYU/juV9gXVdebhef0Aqdzir1RTUxHogvzxFl3ejEBkQDi4Lu7ePKoZ0+/uXXqYDJ0oI YsqLCDuCOuX44xef1GGa+h901uAZYqL4wKbOcEU4bqjbLvdgpB2824fmlGRD0QDrdhPC 7Lr+ctZ8mofg8XUgDRdQs/BxmjOiaBoWe0VEY4iqEKW7Ezl6lx2i3gUDjRAOlOxc0IqN jYZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VQzkuU6S; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 67si11761692plf.222.2019.04.02.09.14.15; Tue, 02 Apr 2019 09:14:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VQzkuU6S; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731091AbfDBQOO (ORCPT + 11 others); Tue, 2 Apr 2019 12:14:14 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:36843 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731073AbfDBQOO (ORCPT ); Tue, 2 Apr 2019 12:14:14 -0400 Received: by mail-wm1-f67.google.com with SMTP id h18so4495994wml.1 for ; Tue, 02 Apr 2019 09:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HADuYtPTNrxpcN8kfE8Fku8tuLIuxpjkI5Oi1Be3G+o=; b=VQzkuU6SBsI98fiYXZpMHIm4v6bJFj9DTp/Q0+njwXd9g6T7vvq8oKQVvBy8POX64z 5vZQVrz0AKWEdIluRz8JSLlHcp6X8mbXSuYTW7nC2pHZK1nnmaxYpkicTyv6RrBr+zyF aDwbPBl+tZR2J9MH2qET6MDXNSgHIacNEL0R14ZhiI5+5ObMyusO174A78Ofm4PhCWkP hiuqnFKNbY89My7MINVDjxlYcugon8F3U70n71YVPJdis0NdO7HOPDvfFET2oixMAlEQ 4enFDZncak6/0+L1JMg3OrXrl5vVtXC/onRA1c3mpURyupAfP6TLsx91XU/NxehbW90O 7FAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HADuYtPTNrxpcN8kfE8Fku8tuLIuxpjkI5Oi1Be3G+o=; b=dIDMJkWrXETKp11jJfgZTg9rBGWnwAmU5F7se6mUiZsk9fEIxuZdl1Tn+7/BOCwO0r dLnWHN+45gLlPtIuQ+YMHkoO5kFfwH6DfJ7SbNzAJNrMrFE9YWyvyllmsoR/hZWjIfAA 3xZYUoPtApyzLhCv4fwNCfi6F+WjFsZQu6w8h0AIDFEFWH4OaTYhEQCmc1S5Ri19OGAZ m5IHmoTQASG6Ri3cY+po6PerLO68htuvr/91eHiYYVVyC3PGxbIew6WbcegDkvnyoGYj qEmwqPEWnoBpmv0GI3EYPPd0CIAuTLkVaetNbeQlMT+ZGnRtHZ++IChF3yQ2VAEGWDit MGFg== X-Gm-Message-State: APjAAAVVzgp/SwFkvjxgtqW1GqcmkzZ/qYmI/kcPmLe43ovGNRwl/7sF 6tB3WO/8fN+LDTdySZ2W3E3iBA== X-Received: by 2002:a1c:f310:: with SMTP id q16mr4100693wmq.102.1554221652721; Tue, 02 Apr 2019 09:14:12 -0700 (PDT) Received: from mai.imgcgcw.net (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id a126sm17054999wmh.4.2019.04.02.09.14.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 09:14:12 -0700 (PDT) From: Daniel Lezcano To: rui.zhang@intel.com, edubezval@gmail.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Jean Delvare , Guenter Roeck , linux-hwmon@vger.kernel.org (open list:HARDWARE MONITORING) Subject: [PATCH 7/7] hwmon/drivers/core: Simplify complex dependency Date: Tue, 2 Apr 2019 18:12:50 +0200 Message-Id: <20190402161256.11044-7-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190402161256.11044-1-daniel.lezcano@linaro.org> References: <20190402161256.11044-1-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org As the thermal framework does not longer compile as a module, we can simplify this condition below: if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) && \ (!defined(CONFIG_THERMAL_HWMON) || \ !(defined(MODULE) && IS_MODULE(CONFIG_THERMAL))) if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) && \ (!defined(CONFIG_THERMAL_HWMON) || \ !(defined(MODULE) && 0)) => (whatever && 0) = 0 if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) && \ (!defined(CONFIG_THERMAL_HWMON) || !(0)) if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) && \ (!defined(CONFIG_THERMAL_HWMON) || 1) => (whatever || 1) = 1 if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) && \ (1) => (whatever && 1) = whatever if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) CONFIG_THERMAL can not be a module anymore, then: if defined(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) And CONFIG_THERMAL_OF already depends on CONFIG_THERMAL, so: if defined(CONFIG_THERMAL_OF) Thus, ifdef CONFIG_THERMAL_OF Signed-off-by: Daniel Lezcano --- drivers/hwmon/hwmon.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.17.1 Acked-by: Guenter Roeck diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index c22dc1e07911..6f76f2484db0 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c @@ -118,9 +118,7 @@ static DEFINE_IDA(hwmon_ida); * The complex conditional is necessary to avoid a cyclic dependency * between hwmon and thermal_sys modules. */ -#if IS_REACHABLE(CONFIG_THERMAL) && defined(CONFIG_THERMAL_OF) && \ - (!defined(CONFIG_THERMAL_HWMON) || \ - !(defined(MODULE) && IS_MODULE(CONFIG_THERMAL))) +#ifdef CONFIG_THERMAL_OF static int hwmon_thermal_get_temp(void *data, int *temp) { struct hwmon_thermal_data *tdata = data;