diff options
author | Zhang, Rui <rui.zhang@intel.com> | 2008-04-10 04:13:10 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-04-29 02:45:49 -0400 |
commit | 9ec732ff80b7e8a9096666f78ae584d3b393bc84 (patch) | |
tree | fae3a8b26c555521ac26992b8c3d897b07921cd5 /drivers/acpi | |
parent | 63c4ec905d63834a97ec7dbbf0a2ec89ef5872be (diff) |
thermal: add new get_crit_temp callback
Add a new callback so that the generic thermal can get
the critical trip point info of a thermal zone,
which is needed for building the tempX_crit hwmon sysfs attribute.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/thermal.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 766bd25d3376..ec707ed1a70f 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
@@ -1012,6 +1012,18 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal, | |||
1012 | return -EINVAL; | 1012 | return -EINVAL; |
1013 | } | 1013 | } |
1014 | 1014 | ||
1015 | static int thermal_get_crit_temp(struct thermal_zone_device *thermal, | ||
1016 | unsigned long *temperature) { | ||
1017 | struct acpi_thermal *tz = thermal->devdata; | ||
1018 | |||
1019 | if (tz->trips.critical.flags.valid) { | ||
1020 | *temperature = KELVIN_TO_MILLICELSIUS( | ||
1021 | tz->trips.critical.temperature); | ||
1022 | return 0; | ||
1023 | } else | ||
1024 | return -EINVAL; | ||
1025 | } | ||
1026 | |||
1015 | typedef int (*cb)(struct thermal_zone_device *, int, | 1027 | typedef int (*cb)(struct thermal_zone_device *, int, |
1016 | struct thermal_cooling_device *); | 1028 | struct thermal_cooling_device *); |
1017 | static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, | 1029 | static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, |
@@ -1103,6 +1115,7 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = { | |||
1103 | .set_mode = thermal_set_mode, | 1115 | .set_mode = thermal_set_mode, |
1104 | .get_trip_type = thermal_get_trip_type, | 1116 | .get_trip_type = thermal_get_trip_type, |
1105 | .get_trip_temp = thermal_get_trip_temp, | 1117 | .get_trip_temp = thermal_get_trip_temp, |
1118 | .get_crit_temp = thermal_get_crit_temp, | ||
1106 | }; | 1119 | }; |
1107 | 1120 | ||
1108 | static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) | 1121 | static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) |