On Sat, Jan 03, 2015 at 10:56:56PM +0100, Geert Uytterhoeven wrote:
> With gcc 4.1.2, 4.2, and 4.2.4 (4.4 and later are OK):
>
> drivers/thermal/thermal_core.h:110: warning: type qualifiers ignored on
> function return type
>
> Signed-off-by: Geert Uytterhoeven <ge...@linux-m68k.org>
> Fixes: ce8be7785922de0e ("thermal: of: Extend of-thermal to export table of
> trip points")
Applied to my -fixes queue. Thanks Geert.
> ---
> drivers/thermal/of-thermal.c | 2 +-
> drivers/thermal/thermal_core.h | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
> index e145b66df444e65b..d717f3dab6f1410f 100644
> --- a/drivers/thermal/of-thermal.c
> +++ b/drivers/thermal/of-thermal.c
> @@ -149,7 +149,7 @@ EXPORT_SYMBOL_GPL(of_thermal_is_trip_valid);
> *
> * Return: pointer to trip points table, NULL otherwise
> */
> -const struct thermal_trip * const
> +const struct thermal_trip *
> of_thermal_get_trip_points(struct thermal_zone_device *tz)
> {
> struct __thermal_zone *data = tz->devdata;
> diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
> index 9083e75206236c19..0531c752fbbb6680 100644
> --- a/drivers/thermal/thermal_core.h
> +++ b/drivers/thermal/thermal_core.h
> @@ -91,7 +91,7 @@ int of_parse_thermal_zones(void);
> void of_thermal_destroy_zones(void);
> int of_thermal_get_ntrips(struct thermal_zone_device *);
> bool of_thermal_is_trip_valid(struct thermal_zone_device *, int);
> -const struct thermal_trip * const
> +const struct thermal_trip *
> of_thermal_get_trip_points(struct thermal_zone_device *);
> #else
> static inline int of_parse_thermal_zones(void) { return 0; }
> @@ -105,7 +105,7 @@ static inline bool of_thermal_is_trip_valid(struct
> thermal_zone_device *tz,
> {
> return 0;
> }
> -static inline const struct thermal_trip * const
> +static inline const struct thermal_trip *
> of_thermal_get_trip_points(struct thermal_zone_device *tz)
> {
> return NULL;
> --
> 1.9.1
>
signature.asc
Description: Digital signature
