Commit c86b3de8 authored Nov 17, 2015 by Arnd Bergmann Committed by Eduardo Valentin Nov 23, 2015

thermal: fix thermal_zone_bind_cooling_device prototype



When the prototype for thermal_zone_bind_cooling_device
changed, the static inline wrapper function was left alone,
which in theory can cause build warnings:

I have seen this error in the past:
drivers/thermal/db8500_thermal.c: In function 'db8500_cdev_bind':
drivers/thermal/db8500_thermal.c:78:9: error: too many arguments to function 'thermal_zone_bind_cooling_device'
   ret = thermal_zone_bind_cooling_device(thermal, i, cdev,

while this one no longer shows up, there is no doubt that
the prototype is still wrong, so let's just fix it anyway.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 6cd9e9f6 ("thermal: of: fix cooling device weights in device tree")
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>

parent e4217468

include/linux/thermal.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -438,7 +438,8 @@ static inline void thermal_zone_device_unregister(
		static inline int thermal_zone_bind_cooling_device(
		struct thermal_zone_device *tz, int trip,
		struct thermal_cooling_device *cdev,
		unsigned long upper, unsigned long lower)
		unsigned long upper, unsigned long lower,
		unsigned int weight)
		{ return -ENODEV; }
		static inline int thermal_zone_unbind_cooling_device(
		struct thermal_zone_device *tz, int trip,

Admin message