lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

thermal: add new get_crit_temp callback

Browse Source 
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>
This commit is contained in:
Zhang, Rui
2008-04-10 16:13:10 +08:00
committed by Len Brown
parent 63c4ec905d
commit 9ec732ff80
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/acpi/thermal.c
View File

@@ -1012,6 +1012,18 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
return -EINVAL; return -EINVAL;
} }
static int thermal_get_crit_temp(struct thermal_zone_device *thermal,
unsigned long *temperature) {
struct acpi_thermal *tz = thermal->devdata;
if (tz->trips.critical.flags.valid) {
*temperature = KELVIN_TO_MILLICELSIUS(
tz->trips.critical.temperature);
return 0;
} else
return -EINVAL;
}
typedef int (*cb)(struct thermal_zone_device *, int, typedef int (*cb)(struct thermal_zone_device *, int,
struct thermal_cooling_device *); struct thermal_cooling_device *);
static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, 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 = {
.set_mode = thermal_set_mode, .set_mode = thermal_set_mode,
.get_trip_type = thermal_get_trip_type, .get_trip_type = thermal_get_trip_type,
.get_trip_temp = thermal_get_trip_temp, .get_trip_temp = thermal_get_trip_temp,
.get_crit_temp = thermal_get_crit_temp,
}; };
static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)

1
include/linux/thermal.h
View File

@@ -41,6 +41,7 @@ struct thermal_zone_device_ops {
int (*set_mode) (struct thermal_zone_device *, const char *); int (*set_mode) (struct thermal_zone_device *, const char *);
int (*get_trip_type) (struct thermal_zone_device *, int, char *); int (*get_trip_type) (struct thermal_zone_device *, int, char *);
int (*get_trip_temp) (struct thermal_zone_device *, int, char *); int (*get_trip_temp) (struct thermal_zone_device *, int, char *);
int (*get_crit_temp) (struct thermal_zone_device *, unsigned long *);
}; };
struct thermal_cooling_device_ops { struct thermal_cooling_device_ops {