Merge branch 'misc' into release

2 files changed, 10 insertions, 22 deletions

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 760e045c93c8..7d0e63c79280 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -841,11 +841,8 @@ static struct class thermal_class = {
  * @devdata:    device private data.
  * @ops:                standard thermal cooling devices callbacks.
  */
-struct thermal_cooling_device *thermal_cooling_device_register(char *type,
-                                                               void *devdata,
-                                                               struct
-                                                               thermal_cooling_device_ops
-                                                               *ops)
+struct thermal_cooling_device *thermal_cooling_device_register(
+     char *type, void *devdata, const struct thermal_cooling_device_ops *ops)
 {
         struct thermal_cooling_device *cdev;
         struct thermal_zone_device *pos;
@@ -1066,13 +1063,9 @@ EXPORT_SYMBOL(thermal_zone_device_update);
  * section 11.1.5.1 of the ACPI specification 3.0.
  */
 struct thermal_zone_device *thermal_zone_device_register(char *type,
-                                                         int trips,
-                                                         void *devdata, struct
-                                                         thermal_zone_device_ops
-                                                         *ops, int tc1, int
-                                                         tc2,
-                                                         int passive_delay,
-                                                         int polling_delay)
+        int trips, void *devdata,
+        const struct thermal_zone_device_ops *ops,
+        int tc1, int tc2, int passive_delay, int polling_delay)
 {
         struct thermal_zone_device *tz;
         struct thermal_cooling_device *pos;
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 784644961279..8651556dbd52 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -77,7 +77,7 @@ struct thermal_cooling_device {
         char type[THERMAL_NAME_LENGTH];
         struct device device;
         void *devdata;
-        struct thermal_cooling_device_ops *ops;
+        const struct thermal_cooling_device_ops *ops;
         struct list_head node;
 };
 
@@ -114,7 +114,7 @@ struct thermal_zone_device {
         int last_temperature;
         bool passive;
         unsigned int forced_passive;
-        struct thermal_zone_device_ops *ops;
+        const struct thermal_zone_device_ops *ops;
         struct list_head cooling_devices;
         struct idr idr;
         struct mutex lock;      /* protect cooling devices list */
@@ -160,11 +160,8 @@ enum {
 #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
 
 struct thermal_zone_device *thermal_zone_device_register(char *, int, void *,
-                                                         struct
-                                                         thermal_zone_device_ops
-                                                         *, int tc1, int tc2,
-                                                         int passive_freq,
-                                                         int polling_freq);
+                const struct thermal_zone_device_ops *, int tc1, int tc2,
+                int passive_freq, int polling_freq);
 void thermal_zone_device_unregister(struct thermal_zone_device *);
 
 int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
@@ -173,9 +170,7 @@ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int,
                                        struct thermal_cooling_device *);
 void thermal_zone_device_update(struct thermal_zone_device *);
 struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
-                                                               struct
-                                                               thermal_cooling_device_ops
-                                                               *);
+                const struct thermal_cooling_device_ops *);
 void thermal_cooling_device_unregister(struct thermal_cooling_device *);
 extern int generate_netlink_event(u32 orig, enum events event);