| Message ID | 1419265668-32283-3-git-send-email-l.majewski@samsung.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Eduardo Valentin |
| Headers | show |
On Mon, Dec 22, 2014 at 05:27:42PM +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 am not sure I understand what you are attempting to do here. What is the relation that you see between CONFIG_OF_THERMAL and thermal_cdev_update? > > Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> > --- > Changes for v2: > - New patch > --- > include/linux/thermal.h | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/include/linux/thermal.h b/include/linux/thermal.h > index 871123c..b3515b5 100644 > --- a/include/linux/thermal.h > +++ b/include/linux/thermal.h > @@ -332,6 +332,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_zone_device * > thermal_zone_of_sensor_register(struct device *dev, int id, void *data, > @@ -353,6 +354,10 @@ thermal_of_cooling_device_register(struct device_node *np, > { > return NULL; > } > + > +static inline void thermal_cdev_update(struct thermal_cooling_device *cdev) > +{ > +} > #endif > struct thermal_zone_device *thermal_zone_device_register(const char *, int, int, > void *, struct thermal_zone_device_ops *, > @@ -375,7 +380,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 >
Hi Eduardo, > On Mon, Dec 22, 2014 at 05:27:42PM +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 am not sure I understand what you are attempting to do here. What is > the relation that you see between CONFIG_OF_THERMAL and > thermal_cdev_update? It should be CONFIG_THERMAL, not CONFIG_OF_THERMAL. The thermal_cdev_update() is necessary since pwm-fan code can be run without THERMAL subsystem (and such configuration is perfectly valid). > > > > > Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> > > --- > > Changes for v2: > > - New patch > > --- > > include/linux/thermal.h | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/include/linux/thermal.h b/include/linux/thermal.h > > index 871123c..b3515b5 100644 > > --- a/include/linux/thermal.h > > +++ b/include/linux/thermal.h > > @@ -332,6 +332,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_zone_device * > > thermal_zone_of_sensor_register(struct device *dev, int id, void > > *data, @@ -353,6 +354,10 @@ > > thermal_of_cooling_device_register(struct device_node *np, { > > return NULL; > > } > > + > > +static inline void thermal_cdev_update(struct > > thermal_cooling_device *cdev) +{ > > +} > > #endif > > struct thermal_zone_device *thermal_zone_device_register(const > > char *, int, int, void *, struct thermal_zone_device_ops *, > > @@ -375,7 +380,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 > >
On Wed, Jan 14, 2015 at 04:07:53PM +0100, Lukasz Majewski wrote: > Hi Eduardo, > > > On Mon, Dec 22, 2014 at 05:27:42PM +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 am not sure I understand what you are attempting to do here. What is > > the relation that you see between CONFIG_OF_THERMAL and > > thermal_cdev_update? > > It should be CONFIG_THERMAL, not CONFIG_OF_THERMAL. > > The thermal_cdev_update() is necessary since pwm-fan code can be > run without THERMAL subsystem (and such configuration is perfectly > valid). OK. Now I understand. Then, please resend this one using CONFIG_THERMAL. Thanks, Eduardo Valentin > > > > > > > > > Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> > > > --- > > > Changes for v2: > > > - New patch > > > --- > > > include/linux/thermal.h | 6 +++++- > > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > > > diff --git a/include/linux/thermal.h b/include/linux/thermal.h > > > index 871123c..b3515b5 100644 > > > --- a/include/linux/thermal.h > > > +++ b/include/linux/thermal.h > > > @@ -332,6 +332,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_zone_device * > > > thermal_zone_of_sensor_register(struct device *dev, int id, void > > > *data, @@ -353,6 +354,10 @@ > > > thermal_of_cooling_device_register(struct device_node *np, { > > > return NULL; > > > } > > > + > > > +static inline void thermal_cdev_update(struct > > > thermal_cooling_device *cdev) +{ > > > +} > > > #endif > > > struct thermal_zone_device *thermal_zone_device_register(const > > > char *, int, int, void *, struct thermal_zone_device_ops *, > > > @@ -375,7 +380,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 > > > > > > -- > Best regards, > > Lukasz Majewski > > Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 871123c..b3515b5 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -332,6 +332,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_zone_device * thermal_zone_of_sensor_register(struct device *dev, int id, void *data, @@ -353,6 +354,10 @@ thermal_of_cooling_device_register(struct device_node *np, { return NULL; } + +static inline void thermal_cdev_update(struct thermal_cooling_device *cdev) +{ +} #endif struct thermal_zone_device *thermal_zone_device_register(const char *, int, int, void *, struct thermal_zone_device_ops *, @@ -375,7 +380,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 --- include/linux/thermal.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)