diff options
| author | Wei Ni <wni@nvidia.com> | 2016-03-03 17:33:46 +0800 |
|---|---|---|
| committer | Eduardo Valentin <edubezval@gmail.com> | 2016-04-20 20:31:14 -0700 |
| commit | 1d0fd42fa31d18ba0a3e0dd008c9e93e1cebe451 (patch) | |
| tree | 8f18189a7e6a3b178718d1e9459b9c893cdadbca | |
| parent | 62e14f6fd383f756ff3fe5f6fb7aa5b546bb47e3 (diff) | |
| download | op-kernel-dev-1d0fd42fa31d18ba0a3e0dd008c9e93e1cebe451.zip op-kernel-dev-1d0fd42fa31d18ba0a3e0dd008c9e93e1cebe451.tar.gz | |
thermal: consistently use int for trip temp
The commit 17e8351a7739 consistently use int for temperature,
however it missed a few in trip temperature and thermal_core.
In current codes, the trip->temperature used "unsigned long"
and zone->temperature used"int", if the temperature is negative
value, it will get wrong result when compare temperature with
trip temperature.
This patch can fix it.
Signed-off-by: Wei Ni <wni@nvidia.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
| -rw-r--r-- | drivers/thermal/thermal_core.c | 8 | ||||
| -rw-r--r-- | include/linux/thermal.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index d4b5465..f1db496 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -688,7 +688,7 @@ trip_point_temp_store(struct device *dev, struct device_attribute *attr, { struct thermal_zone_device *tz = to_thermal_zone(dev); int trip, ret; - unsigned long temperature; + int temperature; if (!tz->ops->set_trip_temp) return -EPERM; @@ -696,7 +696,7 @@ trip_point_temp_store(struct device *dev, struct device_attribute *attr, if (!sscanf(attr->attr.name, "trip_point_%d_temp", &trip)) return -EINVAL; - if (kstrtoul(buf, 10, &temperature)) + if (kstrtoint(buf, 10, &temperature)) return -EINVAL; ret = tz->ops->set_trip_temp(tz, trip, temperature); @@ -899,9 +899,9 @@ emul_temp_store(struct device *dev, struct device_attribute *attr, { struct thermal_zone_device *tz = to_thermal_zone(dev); int ret = 0; - unsigned long temperature; + int temperature; - if (kstrtoul(buf, 10, &temperature)) + if (kstrtoint(buf, 10, &temperature)) return -EINVAL; if (!tz->ops->set_emul_temp) { diff --git a/include/linux/thermal.h b/include/linux/thermal.h index a55d052..1b8a5a7 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -352,8 +352,8 @@ struct thermal_zone_of_device_ops { struct thermal_trip { struct device_node *np; - unsigned long int temperature; - unsigned long int hysteresis; + int temperature; + int hysteresis; enum thermal_trip_type type; }; |
