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/platform | |
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/platform')
-rw-r--r-- | drivers/platform/x86/acerhdf.c | 2 | ||||
-rw-r--r-- | drivers/platform/x86/intel_mid_thermal.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index a207466f4ba8..84c56881ba80 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c | |||
@@ -662,7 +662,7 @@ static int acerhdf_register_thermal(void) | |||
662 | return -EINVAL; | 662 | return -EINVAL; |
663 | 663 | ||
664 | thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL, | 664 | thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL, |
665 | &acerhdf_dev_ops, 0, 0, 0, | 665 | &acerhdf_dev_ops, 0, |
666 | (kernelmode) ? interval*1000 : 0); | 666 | (kernelmode) ? interval*1000 : 0); |
667 | if (IS_ERR(thz_dev)) | 667 | if (IS_ERR(thz_dev)) |
668 | return -EINVAL; | 668 | return -EINVAL; |
diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c index 3a27113deda9..c8097616dd62 100644 --- a/drivers/platform/x86/intel_mid_thermal.c +++ b/drivers/platform/x86/intel_mid_thermal.c | |||
@@ -502,7 +502,7 @@ static int mid_thermal_probe(struct platform_device *pdev) | |||
502 | goto err; | 502 | goto err; |
503 | } | 503 | } |
504 | pinfo->tzd[i] = thermal_zone_device_register(name[i], | 504 | pinfo->tzd[i] = thermal_zone_device_register(name[i], |
505 | 0, 0, td_info, &tzd_ops, 0, 0, 0, 0); | 505 | 0, 0, td_info, &tzd_ops, 0, 0); |
506 | if (IS_ERR(pinfo->tzd[i])) { | 506 | if (IS_ERR(pinfo->tzd[i])) { |
507 | kfree(td_info); | 507 | kfree(td_info); |
508 | ret = PTR_ERR(pinfo->tzd[i]); | 508 | ret = PTR_ERR(pinfo->tzd[i]); |