2 files changed, 14 insertions, 18 deletions

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 037e9df2f610..17292fee8686 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -92,23 +92,19 @@ struct thermal_zone_device_ops {
                      struct thermal_cooling_device *);
         int (*unbind) (struct thermal_zone_device *,
                        struct thermal_cooling_device *);
-        int (*get_temp) (struct thermal_zone_device *, unsigned long *);
+        int (*get_temp) (struct thermal_zone_device *, int *);
         int (*get_mode) (struct thermal_zone_device *,
                          enum thermal_device_mode *);
         int (*set_mode) (struct thermal_zone_device *,
                 enum thermal_device_mode);
         int (*get_trip_type) (struct thermal_zone_device *, int,
                 enum thermal_trip_type *);
-        int (*get_trip_temp) (struct thermal_zone_device *, int,
-                              unsigned long *);
-        int (*set_trip_temp) (struct thermal_zone_device *, int,
-                              unsigned long);
-        int (*get_trip_hyst) (struct thermal_zone_device *, int,
-                              unsigned long *);
-        int (*set_trip_hyst) (struct thermal_zone_device *, int,
-                              unsigned long);
-        int (*get_crit_temp) (struct thermal_zone_device *, unsigned long *);
-        int (*set_emul_temp) (struct thermal_zone_device *, unsigned long);
+        int (*get_trip_temp) (struct thermal_zone_device *, int, int *);
+        int (*set_trip_temp) (struct thermal_zone_device *, int, int);
+        int (*get_trip_hyst) (struct thermal_zone_device *, int, int *);
+        int (*set_trip_hyst) (struct thermal_zone_device *, int, int);
+        int (*get_crit_temp) (struct thermal_zone_device *, int *);
+        int (*set_emul_temp) (struct thermal_zone_device *, int);
         int (*get_trend) (struct thermal_zone_device *, int,
                           enum thermal_trend *);
         int (*notify) (struct thermal_zone_device *, int,
@@ -332,9 +328,9 @@ struct thermal_genl_event {
  *                 temperature.
  */
 struct thermal_zone_of_device_ops {
-        int (*get_temp)(void *, long *);
+        int (*get_temp)(void *, int *);
         int (*get_trend)(void *, long *);
-        int (*set_emul_temp)(void *, unsigned long);
+        int (*set_emul_temp)(void *, int);
 };
 
 /**
@@ -406,7 +402,7 @@ 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);
+int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);
 
 int get_tz_trend(struct thermal_zone_device *, int);
 struct thermal_instance *get_thermal_instance(struct thermal_zone_device *,
@@ -457,7 +453,7 @@ static inline struct thermal_zone_device *thermal_zone_get_zone_by_name(
                 const char *name)
 { return ERR_PTR(-ENODEV); }
 static inline int thermal_zone_get_temp(
-                struct thermal_zone_device *tz, unsigned long *temp)
+                struct thermal_zone_device *tz, int *temp)
 { return -ENODEV; }
 static inline int get_tz_trend(struct thermal_zone_device *tz, int trip)
 { return -ENODEV; }
diff --git a/include/trace/events/thermal_power_allocator.h b/include/trace/events/thermal_power_allocator.h
index 12e1321c4e0c..5afae8fe3795 100644
--- a/include/trace/events/thermal_power_allocator.h
+++ b/include/trace/events/thermal_power_allocator.h
@@ -11,7 +11,7 @@ TRACE_EVENT(thermal_power_allocator,
                  u32 total_req_power, u32 *granted_power,
                  u32 total_granted_power, size_t num_actors,
                  u32 power_range, u32 max_allocatable_power,
-                 unsigned long current_temp, s32 delta_temp),
+                 int current_temp, s32 delta_temp),
         TP_ARGS(tz, req_power, total_req_power, granted_power,
                 total_granted_power, num_actors, power_range,
                 max_allocatable_power, current_temp, delta_temp),
@@ -24,7 +24,7 @@ TRACE_EVENT(thermal_power_allocator,
                 __field(size_t,        num_actors               )
                 __field(u32,           power_range              )
                 __field(u32,           max_allocatable_power    )
-                __field(unsigned long, current_temp             )
+                __field(int,           current_temp             )
                 __field(s32,           delta_temp               )
         ),
         TP_fast_assign(
@@ -42,7 +42,7 @@ TRACE_EVENT(thermal_power_allocator,
                 __entry->delta_temp = delta_temp;
         ),
 
-        TP_printk("thermal_zone_id=%d req_power={%s} total_req_power=%u granted_power={%s} total_granted_power=%u power_range=%u max_allocatable_power=%u current_temperature=%lu delta_temperature=%d",
+        TP_printk("thermal_zone_id=%d req_power={%s} total_req_power=%u granted_power={%s} total_granted_power=%u power_range=%u max_allocatable_power=%u current_temperature=%d delta_temperature=%d",
                 __entry->tz_id,
                 __print_array(__get_dynamic_array(req_power),
                               __entry->num_actors, 4),