acpi thermal trip points increased to 12

The THERMAL_MAX_TRIPS value is set to 10.  It is too few for the Compaq AP550
machine which has 12 trip points.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: Len Brown <lenb@kernel.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/thermal/thermal.c b/drivers/thermal/thermal.c
index 8b86e53ccf7a081586d32d09350dce072f2ef75e..7f79bbf652d7483c1a11f1b793973f0eddf345f4 100644 (file)
--- a/drivers/thermal/thermal.c
+++ b/drivers/thermal/thermal.c
@@ -196,6 +196,10 @@ static struct device_attribute trip_point_attrs[] = {
        __ATTR(trip_point_8_temp, 0444, trip_point_temp_show, NULL),
        __ATTR(trip_point_9_type, 0444, trip_point_type_show, NULL),
        __ATTR(trip_point_9_temp, 0444, trip_point_temp_show, NULL),
+       __ATTR(trip_point_10_type, 0444, trip_point_type_show, NULL),
+       __ATTR(trip_point_10_temp, 0444, trip_point_temp_show, NULL),
+       __ATTR(trip_point_11_type, 0444, trip_point_type_show, NULL),
+       __ATTR(trip_point_11_temp, 0444, trip_point_temp_show, NULL),
 };
 
 #define TRIP_POINT_ATTR_ADD(_dev, _index, result)     \

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 818ca1cf0b6d81d4f74faebcbdb6eef9123d90a7..90c1c191ea694707679e067209c24b6616721f54 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -50,7 +50,7 @@ struct thermal_cooling_device_ops {
 };
 
 #define THERMAL_TRIPS_NONE -1
-#define THERMAL_MAX_TRIPS 10
+#define THERMAL_MAX_TRIPS 12
 #define THERMAL_NAME_LENGTH 20
 struct thermal_cooling_device {
        int id;