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/acpi/thermal.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/acpi/thermal.c')
-rw-r--r-- | drivers/acpi/thermal.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index bb95709a6be8..07cb2172bd09 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
@@ -897,15 +897,12 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) | |||
897 | tz->thermal_zone = | 897 | tz->thermal_zone = |
898 | thermal_zone_device_register("acpitz", trips, 0, tz, | 898 | thermal_zone_device_register("acpitz", trips, 0, tz, |
899 | &acpi_thermal_zone_ops, | 899 | &acpi_thermal_zone_ops, |
900 | tz->trips.passive.tc1, | ||
901 | tz->trips.passive.tc2, | ||
902 | tz->trips.passive.tsp*100, | 900 | tz->trips.passive.tsp*100, |
903 | tz->polling_frequency*100); | 901 | tz->polling_frequency*100); |
904 | else | 902 | else |
905 | tz->thermal_zone = | 903 | tz->thermal_zone = |
906 | thermal_zone_device_register("acpitz", trips, 0, tz, | 904 | thermal_zone_device_register("acpitz", trips, 0, tz, |
907 | &acpi_thermal_zone_ops, | 905 | &acpi_thermal_zone_ops, 0, |
908 | 0, 0, 0, | ||
909 | tz->polling_frequency*100); | 906 | tz->polling_frequency*100); |
910 | if (IS_ERR(tz->thermal_zone)) | 907 | if (IS_ERR(tz->thermal_zone)) |
911 | return -ENODEV; | 908 | return -ENODEV; |