Skip to content

Commit

Permalink
thermal: of: Remove bogus type qualifier for of_thermal_get_trip_poin…
Browse files Browse the repository at this point in the history
…ts()

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: ce8be7785922de0e ("thermal: of: Extend of-thermal to export table of trip points")
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
(cherry picked from commit ebc3193ae0df723f4d8abd06890cd77354493c79)
Signed-off-by: Kevin Hilman <khilman@linaro.org>
  • Loading branch information
geertu authored and Kevin Hilman committed Jun 5, 2015
1 parent e4db227 commit 98c1856
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/thermal/of-thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/thermal/thermal_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand All @@ -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;
Expand Down

0 comments on commit 98c1856

Please sign in to comment.