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 /drivers/power/power_supply_core.c | |
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 'drivers/power/power_supply_core.c')
-rw-r--r-- | drivers/power/power_supply_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 08cc8a3c15af..2436f1350013 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c | |||
@@ -201,7 +201,7 @@ static int psy_register_thermal(struct power_supply *psy) | |||
201 | for (i = 0; i < psy->num_properties; i++) { | 201 | for (i = 0; i < psy->num_properties; i++) { |
202 | if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) { | 202 | if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) { |
203 | psy->tzd = thermal_zone_device_register(psy->name, 0, 0, | 203 | psy->tzd = thermal_zone_device_register(psy->name, 0, 0, |
204 | psy, &psy_tzd_ops, 0, 0, 0, 0); | 204 | psy, &psy_tzd_ops, 0, 0); |
205 | if (IS_ERR(psy->tzd)) | 205 | if (IS_ERR(psy->tzd)) |
206 | return PTR_ERR(psy->tzd); | 206 | return PTR_ERR(psy->tzd); |
207 | break; | 207 | break; |