diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 13:14:15 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 13:14:15 +0300 |
| commit | 156d821270e131dee7d89fc4aa385f0f9b1900ea (patch) | |
| tree | 2d3a4bfea184033c1eae48846ecd357c82021e85 /include/linux/thermal.h | |
| parent | 3e098984073795bff5e5e3edbc1f5b0514c47c92 (diff) | |
| parent | 5b275ce27077d6463ca28c9671dce7c2c1f622e2 (diff) | |
| download | linux-156d821270e131dee7d89fc4aa385f0f9b1900ea.tar.xz | |
Merge branch 'misc' into release
Diffstat (limited to 'include/linux/thermal.h')
| -rw-r--r-- | include/linux/thermal.h | 15 |
1 files changed, 5 insertions, 10 deletions
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); |