diff options
author | Zhang Rui <rui.zhang@intel.com> | 2012-06-26 21:51:12 -0400 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2012-09-24 02:44:36 -0400 |
commit | 1b7ddb840c3908464b19d4aa4f6dc4c463302442 (patch) | |
tree | 1fe5719ab4e3bc895dde8bfb0f480d18746498fb /include | |
parent | 601f3d4242be6ed6f72a2aadabc91e8255dad811 (diff) |
Thermal: Remove tc1/tc2 in generic thermal layer.
Remove tc1/tc2 in generic thermal layer.
.get_trend() callback starts to take effect from this patch.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Rafael J. Wysocki <rjw@sisk.pl>
Reviewed-by: Valentin, Eduardo <eduardo.valentin@ti.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/thermal.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 6a1d43d2ec92..38267a595d69 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h | |||
@@ -115,8 +115,6 @@ struct thermal_zone_device { | |||
115 | struct thermal_attr *trip_hyst_attrs; | 115 | struct thermal_attr *trip_hyst_attrs; |
116 | void *devdata; | 116 | void *devdata; |
117 | int trips; | 117 | int trips; |
118 | int tc1; | ||
119 | int tc2; | ||
120 | int passive_delay; | 118 | int passive_delay; |
121 | int polling_delay; | 119 | int polling_delay; |
122 | int temperature; | 120 | int temperature; |
@@ -163,8 +161,7 @@ enum { | |||
163 | #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1) | 161 | #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1) |
164 | 162 | ||
165 | struct thermal_zone_device *thermal_zone_device_register(const char *, int, int, | 163 | struct thermal_zone_device *thermal_zone_device_register(const char *, int, int, |
166 | void *, const struct thermal_zone_device_ops *, int tc1, | 164 | void *, const struct thermal_zone_device_ops *, int, int); |
167 | int tc2, int passive_freq, int polling_freq); | ||
168 | void thermal_zone_device_unregister(struct thermal_zone_device *); | 165 | void thermal_zone_device_unregister(struct thermal_zone_device *); |
169 | 166 | ||
170 | int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, | 167 | int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, |