From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukasz Majewski Subject: Re: [PATCH v2 1/8] thermal: Provide stub for thermal_of_cooling_device_register() function Date: Wed, 14 Jan 2015 16:01:06 +0100 Message-ID: <20150114160106.20aa160b@amdc2363> References: <1418897591-18332-1-git-send-email-l.majewski@samsung.com> <1419265668-32283-1-git-send-email-l.majewski@samsung.com> <1419265668-32283-2-git-send-email-l.majewski@samsung.com> <20150102185426.GC12485@developer> <20150102190339.GA22356@developer> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-reply-to: <20150102190339.GA22356@developer> Sender: linux-kernel-owner@vger.kernel.org To: Eduardo Valentin Cc: Kamil Debski , Jean Delvare , Guenter Roeck , 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, Sylwester Nawrocki , Abhilash Kesavan , Abhilash Kesavan List-Id: devicetree@vger.kernel.org Hi Eduardo, > On Fri, Jan 02, 2015 at 02:54:28PM -0400, Eduardo Valentin wrote: > > On Mon, Dec 22, 2014 at 05:27:41PM +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. > > >=20 > > > Therefore, the thermal_of_cooling_device_register() function > > > needs a stub to allow clean compilation. > > >=20 > > > Signed-off-by: Lukasz Majewski > >=20 > > Acked-by: Eduardo Valentin >=20 > Sorry, too fast, >=20 > This is actually > Nacked-by: Eduardo Valentin >=20 > :-) >=20 > I get this error: > drivers/thermal/thermal_core.c:1210:1: error: redefinition of > =E2=80=98thermal_of_cooling_device_register=E2=80=99 > thermal_of_cooling_device_register(struct device_node *np, > ^ > In file included from drivers/thermal/thermal_core.c:34:0: > include/linux/thermal.h:321:1: note: previous definition of > =E2=80=98thermal_of_cooling_device_register=E2=80=99 was here > thermal_of_cooling_device_register(struct device_node *np, > ^ >=20 >=20 > We provide the function in thermal core even if CONFIG_THERMAL_OF is > not set. Unfortunately the PWM fan subsystem can work perfectly fine without CONFIG_THERMAL. I think that it would be enough to make something like this in the ./include/linux/thermal.h: #ifdef CONFIG_THERMAL static inline struct thermal_cooling_device * thermal_of_cooling_device_register(struct device_node *np, char *type, void *devdata, const struct thermal_cooling_device_ops *ops) { return NULL; } #else [ already present declaration of thermal_of_cooling_device_register() ] #endif /* CONFIG_THERMAL */ > >=20 > > > --- > > > Changes for v2: > > > - None > > > --- > > > include/linux/thermal.h | 14 +++++++++++--- > > > 1 file changed, 11 insertions(+), 3 deletions(-) > > >=20 > > > diff --git a/include/linux/thermal.h b/include/linux/thermal.h > > > index 2de3d9e..871123c 100644 > > > --- a/include/linux/thermal.h > > > +++ b/include/linux/thermal.h > > > @@ -328,6 +328,10 @@ thermal_zone_of_sensor_register(struct > > > device *dev, int id, void *data, const struct > > > thermal_zone_of_device_ops *ops); void > > > thermal_zone_of_sensor_unregister(struct device *dev, struct > > > thermal_zone_device *tz); +struct thermal_cooling_device * > > > +thermal_of_cooling_device_register(struct device_node *np, > > > + char *type, void *devdata, > > > + const struct > > > thermal_cooling_device_ops *); #else > > > static inline struct thermal_zone_device * > > > thermal_zone_of_sensor_register(struct device *dev, int id, void > > > *data, @@ -342,6 +346,13 @@ void > > > thermal_zone_of_sensor_unregister(struct device *dev, { > > > } > > > =20 > > > +static inline struct thermal_cooling_device * > > > +thermal_of_cooling_device_register(struct device_node *np, > > > + char *type, void *devdata, > > > + const struct > > > thermal_cooling_device_ops *ops) +{ > > > + return NULL; > > > +} > > > #endif > > > struct thermal_zone_device *thermal_zone_device_register(const > > > char *, int, int, void *, struct thermal_zone_device_ops *, > > > @@ -357,9 +368,6 @@ void thermal_zone_device_update(struct > > > thermal_zone_device *);=20 > > > struct thermal_cooling_device > > > *thermal_cooling_device_register(char *, void *, const struct > > > thermal_cooling_device_ops *); -struct thermal_cooling_device * > > > -thermal_of_cooling_device_register(struct device_node *np, char > > > *, void *, > > > - const struct > > > thermal_cooling_device_ops *); void > > > thermal_cooling_device_unregister(struct thermal_cooling_device > > > *); struct thermal_zone_device > > > *thermal_zone_get_zone_by_name(const char *name); int > > > thermal_zone_get_temp(struct thermal_zone_device *tz, unsigned > > > long *temp); -- 2.0.0.rc2 > > >=20 >=20 >=20 --=20 Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group