From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukasz Majewski Subject: [PATCH v3 2/8] thermal: Provide stub for thermal_cdev_update() function Date: Fri, 06 Feb 2015 17:59:02 +0100 Message-ID: <1423241948-31981-3-git-send-email-l.majewski@samsung.com> References: <1418897591-18332-1-git-send-email-l.majewski@samsung.com> <1423241948-31981-1-git-send-email-l.majewski@samsung.com> Return-path: In-reply-to: <1423241948-31981-1-git-send-email-l.majewski@samsung.com> Sender: linux-kernel-owner@vger.kernel.org To: Eduardo Valentin , Kamil Debski , Jean Delvare , Guenter Roeck , Kukjin Kim Cc: lm-sensors@lm-sensors.org, Linux PM list , "linux-samsung-soc@vger.kernel.org" , devicetree@vger.kernel.org, Lukasz Majewski , Kukjin Kim , linux-kernel@vger.kernel.org, Sjoerd Simons , Abhilash Kesavan , Abhilash Kesavan , Lukasz Majewski List-Id: devicetree@vger.kernel.org Odroid U3 fan can work without being registered as OF cooling device (with CONFIG_THERMAL{_OF|} disabled). In this situation it can be controlled via PWM entry at /sys/class/hwmon/hwmon0/pwm1. Therefore, the thermal_cdev_update() function needs a stub to allow clean compilation. Signed-off-by: Lukasz Majewski --- Changes for v2: - New patch Changes for v3: - thermal_cdev_update() now depends on CONFIG_THERMAL flag --- include/linux/thermal.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/thermal.h b/include/linux/thermal.h index eacf2de..25382e6 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -298,6 +298,7 @@ struct thermal_cooling_device * thermal_of_cooling_device_register(struct device_node *np, char *type, void *devdata, const struct thermal_cooling_device_ops *); +void thermal_cdev_update(struct thermal_cooling_device *); #else static inline struct thermal_cooling_device * thermal_of_cooling_device_register(struct device_node *np, @@ -306,6 +307,9 @@ thermal_of_cooling_device_register(struct device_node *np, { return NULL; } +static inline void thermal_cdev_update(struct thermal_cooling_device *cdev) +{ +} #endif #ifdef CONFIG_THERMAL_OF struct thermal_zone_device * @@ -349,7 +353,6 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, unsigned long *temp); int get_tz_trend(struct thermal_zone_device *, int); struct thermal_instance *get_thermal_instance(struct thermal_zone_device *, struct thermal_cooling_device *, int); -void thermal_cdev_update(struct thermal_cooling_device *); void thermal_notify_framework(struct thermal_zone_device *, int); #ifdef CONFIG_NET -- 2.0.0.rc2