[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200403205133.1101808-1-martin.blumenstingl@googlemail.com>
Date: Fri, 3 Apr 2020 22:51:33 +0200
From: Martin Blumenstingl <martin.blumenstingl@...glemail.com>
To: rui.zhang@...el.com, daniel.lezcano@...aro.org,
amit.kucheria@...durent.com, linux-pm@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, javi.merino@...nel.org,
edubezval@...il.com, orjan.eide@....com, tzimmermann@...e.de,
Martin Blumenstingl <martin.blumenstingl@...glemail.com>,
stable@...r.kernel.org
Subject: [PATCH] thermal: devfreq_cooling: inline all stubs for CONFIG_DEVFREQ_THERMAL=n
When CONFIG_DEVFREQ_THERMAL is disabled all functions except
of_devfreq_cooling_register_power() were already inlined. Also inline
the last function to avoid compile errors when multiple drivers call
of_devfreq_cooling_register_power() when CONFIG_DEVFREQ_THERMAL is not
set. Compilation failed with the following message:
multiple definition of `of_devfreq_cooling_register_power'
(which then lists all usages of of_devfreq_cooling_register_power())
Thomas Zimmermann reported this problem [0] on a kernel config with
CONFIG_DRM_LIMA={m,y}, CONFIG_DRM_PANFROST={m,y} and
CONFIG_DEVFREQ_THERMAL=n after both, the lima and panfrost drivers
gained devfreq cooling support.
[0] https://www.spinics.net/lists/dri-devel/msg252825.html
Fixes: a76caf55e5b356 ("thermal: Add devfreq cooling")
Cc: stable@...r.kernel.org
Reported-by: Thomas Zimmermann <tzimmermann@...e.de>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@...glemail.com>
---
include/linux/devfreq_cooling.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/devfreq_cooling.h b/include/linux/devfreq_cooling.h
index 4635f95000a4..79a6e37a1d6f 100644
--- a/include/linux/devfreq_cooling.h
+++ b/include/linux/devfreq_cooling.h
@@ -75,7 +75,7 @@ void devfreq_cooling_unregister(struct thermal_cooling_device *dfc);
#else /* !CONFIG_DEVFREQ_THERMAL */
-struct thermal_cooling_device *
+static inline struct thermal_cooling_device *
of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,
struct devfreq_cooling_power *dfc_power)
{
--
2.26.0
Powered by blists - more mailing lists