| Message ID | 1424254056-5904-3-git-send-email-l.majewski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Feb 18, 2015 at 11:07:30AM +0100, Lukasz Majewski wrote: > 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. I've just applied a patch on this same matter from Nishanth Menon [1]. Can you please check if his patch is enough for you? [1] - https://git.kernel.org/cgit/linux/kernel/git/evalenti/linux-soc-thermal.git/commit/?h=fixes&id=12ca7188468ee29c4e717f73db4bf43c90954fc7 > > Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> > --- > Changes for v2: > - New patch > Changes for v3: > - thermal_cdev_update() now depends on CONFIG_THERMAL flag > Changes for v4: > - None > --- > 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 >
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
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 <l.majewski@samsung.com> --- Changes for v2: - New patch Changes for v3: - thermal_cdev_update() now depends on CONFIG_THERMAL flag Changes for v4: - None --- include/linux/thermal.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)