summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2012-06-27 09:51:12 +0800
committerZhang Rui <rui.zhang@intel.com>2012-09-24 14:44:36 +0800
commit1b7ddb840c3908464b19d4aa4f6dc4c463302442 (patch)
tree1fe5719ab4e3bc895dde8bfb0f480d18746498fb /drivers/power
parent601f3d4242be6ed6f72a2aadabc91e8255dad811 (diff)
downloadlinux-3.10-1b7ddb840c3908464b19d4aa4f6dc4c463302442.tar.gz
linux-3.10-1b7ddb840c3908464b19d4aa4f6dc4c463302442.tar.bz2
linux-3.10-1b7ddb840c3908464b19d4aa4f6dc4c463302442.zip
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')
-rw-r--r--drivers/power/power_supply_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 08cc8a3c15a..2436f135001 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)
for (i = 0; i < psy->num_properties; i++) {
if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) {
psy->tzd = thermal_zone_device_register(psy->name, 0, 0,
- psy, &psy_tzd_ops, 0, 0, 0, 0);
+ psy, &psy_tzd_ops, 0, 0);
if (IS_ERR(psy->tzd))
return PTR_ERR(psy->tzd);
break;