From 79829a4778f7b362d823eadf02994f64a25c40fd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 10 Feb 2019 12:20:03 +0100 Subject: [PATCH] 4.4-stable patches added patches: thermal-hwmon-inline-helpers-when-config_thermal_hwmon-is-not-set.patch --- queue-4.4/series | 1 + ...when-config_thermal_hwmon-is-not-set.patch | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 queue-4.4/thermal-hwmon-inline-helpers-when-config_thermal_hwmon-is-not-set.patch diff --git a/queue-4.4/series b/queue-4.4/series index 53ce3f17e63..cf6664c7c85 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -75,3 +75,4 @@ hid-lenovo-add-checks-to-fix-of_led_classdev_registe.patch kernel-hung_task.c-break-rcu-locks-based-on-jiffies.patch fs-epoll-drop-ovflist-branch-prediction.patch exec-load_script-don-t-blindly-truncate-shebang-stri.patch +thermal-hwmon-inline-helpers-when-config_thermal_hwmon-is-not-set.patch diff --git a/queue-4.4/thermal-hwmon-inline-helpers-when-config_thermal_hwmon-is-not-set.patch b/queue-4.4/thermal-hwmon-inline-helpers-when-config_thermal_hwmon-is-not-set.patch new file mode 100644 index 00000000000..3a4fc184b4c --- /dev/null +++ b/queue-4.4/thermal-hwmon-inline-helpers-when-config_thermal_hwmon-is-not-set.patch @@ -0,0 +1,43 @@ +From 03334ba8b425b2ad275c8f390cf83c7b081c3095 Mon Sep 17 00:00:00 2001 +From: Eduardo Valentin +Date: Wed, 2 Jan 2019 00:34:03 +0000 +Subject: thermal: hwmon: inline helpers when CONFIG_THERMAL_HWMON is not set +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Eduardo Valentin + +commit 03334ba8b425b2ad275c8f390cf83c7b081c3095 upstream. + +Avoid warnings like this: +thermal_hwmon.h:29:1: warning: ‘thermal_remove_hwmon_sysfs’ defined but not used [-Wunused-function] + thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz) + +Fixes: 0dd88793aacd ("thermal: hwmon: move hwmon support to single file") +Reviewed-by: Geert Uytterhoeven +Signed-off-by: Eduardo Valentin +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/thermal/thermal_hwmon.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/thermal/thermal_hwmon.h ++++ b/drivers/thermal/thermal_hwmon.h +@@ -34,13 +34,13 @@ + int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz); + void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz); + #else +-static int ++static inline int + thermal_add_hwmon_sysfs(struct thermal_zone_device *tz) + { + return 0; + } + +-static void ++static inline void + thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz) + { + } -- 2.47.2