| Message ID | 1342679480-5336-4-git-send-email-rui.zhang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Rui, No major comments. Just some spell checks. > -----Original Message----- > From: Zhang, Rui > Sent: Thursday, July 19, 2012 12:01 PM > To: linux-acpi@vger.kernel.org; linux-pm@vger.kernel.org > Cc: Rafael J. Wysocki; Matthew Garrett; Len Brown; R, Durgadoss; Eduardo > Valentin; Amit Kachhap; Wei Ni; Zhang, Rui > Subject: [PATCH 03/16] Thermal: Documentation update > > With commit 6503e5df08008b9a47022b5e9ebba658c8fa69af, > the value of /sys/class/thermal/thermal_zoneX/mode has been changed > from user/kernel to enabled/disabled. > Update the documentation so that users won't be confused. > > Signed-off-by: Zhang Rui <rui.zhang@intel.com> > --- > Documentation/thermal/sysfs-api.txt | 20 ++++++++++---------- > drivers/acpi/thermal.c | 6 ++---- > 2 files changed, 12 insertions(+), 14 deletions(-) > > diff --git a/Documentation/thermal/sysfs-api.txt > b/Documentation/thermal/sysfs-api.txt > index 3c8c2f8..b7b3609 100644 > --- a/Documentation/thermal/sysfs-api.txt > +++ b/Documentation/thermal/sysfs-api.txt > @@ -47,11 +47,11 @@ temperature) and throttle appropriate devices. > .bind: bind the thermal zone device with a thermal cooling device. > .unbind: unbind the thermal zone device with a thermal cooling device. > .get_temp: get the current temperature of the thermal zone. > - .get_mode: get the current mode (user/kernel) of the thermal zone. > - - "kernel" means thermal management is done in kernel. > - - "user" will prevent kernel thermal driver actions upon trip points > + .get_mode: get the current mode (enabled/disabled) of the thermal > zone. > + - "enabled" means the kernel thermal management is enabled. > + - "disable" will prevent kernel thermal driver actions upon trip points /s/disable/disabled > so that user applications can take charge of thermal management. > - .set_mode: set the mode (user/kernel) of the thermal zone. > + .set_mode: set the mode (enabled/disabled) of the thermal zone. > .get_trip_type: get the type of certain trip point. > .get_trip_temp: get the temperature above which the certain trip point > will be fired. > @@ -170,14 +170,14 @@ temp > RO, Required > > mode > - One of the predefined values in [kernel, user]. > + One of the predefined values in [enabled, disableed]. /s/disableed/disabled Thanks, Durga -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, Durga, thanks for review. :) On ?, 2012-07-19 at 04:51 -0600, R, Durgadoss wrote: > Hi Rui, > > No major comments. Just some spell checks. > > > -----Original Message----- > > From: Zhang, Rui > > Sent: Thursday, July 19, 2012 12:01 PM > > To: linux-acpi@vger.kernel.org; linux-pm@vger.kernel.org > > Cc: Rafael J. Wysocki; Matthew Garrett; Len Brown; R, Durgadoss; Eduardo > > Valentin; Amit Kachhap; Wei Ni; Zhang, Rui > > Subject: [PATCH 03/16] Thermal: Documentation update > > > > With commit 6503e5df08008b9a47022b5e9ebba658c8fa69af, > > the value of /sys/class/thermal/thermal_zoneX/mode has been changed > > from user/kernel to enabled/disabled. > > Update the documentation so that users won't be confused. > > > > Signed-off-by: Zhang Rui <rui.zhang@intel.com> > > --- > > Documentation/thermal/sysfs-api.txt | 20 ++++++++++---------- > > drivers/acpi/thermal.c | 6 ++---- > > 2 files changed, 12 insertions(+), 14 deletions(-) > > > > diff --git a/Documentation/thermal/sysfs-api.txt > > b/Documentation/thermal/sysfs-api.txt > > index 3c8c2f8..b7b3609 100644 > > --- a/Documentation/thermal/sysfs-api.txt > > +++ b/Documentation/thermal/sysfs-api.txt > > @@ -47,11 +47,11 @@ temperature) and throttle appropriate devices. > > .bind: bind the thermal zone device with a thermal cooling device. > > .unbind: unbind the thermal zone device with a thermal cooling device. > > .get_temp: get the current temperature of the thermal zone. > > - .get_mode: get the current mode (user/kernel) of the thermal zone. > > - - "kernel" means thermal management is done in kernel. > > - - "user" will prevent kernel thermal driver actions upon trip points > > + .get_mode: get the current mode (enabled/disabled) of the thermal > > zone. > > + - "enabled" means the kernel thermal management is enabled. > > + - "disable" will prevent kernel thermal driver actions upon trip points > > /s/disable/disabled > fixed. thanks, rui > > so that user applications can take charge of thermal management. > > - .set_mode: set the mode (user/kernel) of the thermal zone. > > + .set_mode: set the mode (enabled/disabled) of the thermal zone. > > .get_trip_type: get the type of certain trip point. > > .get_trip_temp: get the temperature above which the certain trip point > > will be fired. > > @@ -170,14 +170,14 @@ temp > > RO, Required > > > > mode > > - One of the predefined values in [kernel, user]. > > + One of the predefined values in [enabled, disableed]. > > /s/disableed/disabled > > Thanks, > Durga -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt index 3c8c2f8..b7b3609 100644 --- a/Documentation/thermal/sysfs-api.txt +++ b/Documentation/thermal/sysfs-api.txt @@ -47,11 +47,11 @@ temperature) and throttle appropriate devices. .bind: bind the thermal zone device with a thermal cooling device. .unbind: unbind the thermal zone device with a thermal cooling device. .get_temp: get the current temperature of the thermal zone. - .get_mode: get the current mode (user/kernel) of the thermal zone. - - "kernel" means thermal management is done in kernel. - - "user" will prevent kernel thermal driver actions upon trip points + .get_mode: get the current mode (enabled/disabled) of the thermal zone. + - "enabled" means the kernel thermal management is enabled. + - "disable" will prevent kernel thermal driver actions upon trip points so that user applications can take charge of thermal management. - .set_mode: set the mode (user/kernel) of the thermal zone. + .set_mode: set the mode (enabled/disabled) of the thermal zone. .get_trip_type: get the type of certain trip point. .get_trip_temp: get the temperature above which the certain trip point will be fired. @@ -170,14 +170,14 @@ temp RO, Required mode - One of the predefined values in [kernel, user]. + One of the predefined values in [enabled, disableed]. This file gives information about the algorithm that is currently managing the thermal zone. It can be either default kernel based algorithm or user space application. - kernel = Thermal management in kernel thermal zone driver. - user = Preventing kernel thermal zone driver actions upon - trip points so that user application can take full - charge of the thermal management. + enabled = enable Kernel Thermal management. + disabled = Preventing kernel thermal zone driver actions upon + trip points so that user application can take full + charge of the thermal management. RW, Optional trip_point_[0-*]_temp @@ -256,7 +256,7 @@ If the processor is listed in _PSL method, and the fan is listed in _AL0 |thermal_zone1: |---type: acpitz |---temp: 37000 - |---mode: kernel + |---mode: enabled |---trip_point_0_temp: 100000 |---trip_point_0_type: critical |---trip_point_1_temp: 80000 diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 2107d1b..8275e7b 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -550,8 +550,6 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, return 0; } -static const char enabled[] = "kernel"; -static const char disabled[] = "user"; static int thermal_get_mode(struct thermal_zone_device *thermal, enum thermal_device_mode *mode) { @@ -588,8 +586,8 @@ static int thermal_set_mode(struct thermal_zone_device *thermal, if (enable != tz->tz_enabled) { tz->tz_enabled = enable; ACPI_DEBUG_PRINT((ACPI_DB_INFO, - "%s ACPI thermal control\n", - tz->tz_enabled ? enabled : disabled)); + "%s kernel ACPI thermal control\n", + tz->tz_enabled ? "Enable" : "Disable")); acpi_thermal_check(tz); } return 0;
With commit 6503e5df08008b9a47022b5e9ebba658c8fa69af, the value of /sys/class/thermal/thermal_zoneX/mode has been changed from user/kernel to enabled/disabled. Update the documentation so that users won't be confused. Signed-off-by: Zhang Rui <rui.zhang@intel.com> --- Documentation/thermal/sysfs-api.txt | 20 ++++++++++---------- drivers/acpi/thermal.c | 6 ++---- 2 files changed, 12 insertions(+), 14 deletions(-)