public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

thermal: of: Remove bogus type qualifier for of_thermal_get_trip_points()

Browse source 
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 <geert@linux-m68k.org>
Fixes: ce8be77859 ("thermal: of: Extend of-thermal to export table of trip points")
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Geert Uytterhoeven 2015-01-03 22:56:56 +01:00 • committed by Eduardo Valentin
parent 5e0f872c7d
commit ebc3193ae0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/thermal/of-thermal.c
View file

@ -149,7 +149,7 @@ EXPORT_SYMBOL_GPL(of_thermal_is_trip_valid);
* *
* Return: pointer to trip points table, NULL otherwise * 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) of_thermal_get_trip_points(struct thermal_zone_device *tz)
{ {
struct __thermal_zone *data = tz->devdata; struct __thermal_zone *data = tz->devdata;

4
drivers/thermal/thermal_core.h
View file

@ -91,7 +91,7 @@ int of_parse_thermal_zones(void);
void of_thermal_destroy_zones(void); void of_thermal_destroy_zones(void);
int of_thermal_get_ntrips(struct thermal_zone_device *); int of_thermal_get_ntrips(struct thermal_zone_device *);
bool of_thermal_is_trip_valid(struct thermal_zone_device *, int); 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 *); of_thermal_get_trip_points(struct thermal_zone_device *);
#else #else
static inline int of_parse_thermal_zones(void) { return 0; } 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; 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) of_thermal_get_trip_points(struct thermal_zone_device *tz)
{ {
return NULL; return NULL;