drivers/thermal/thermal_core.c | 45 +++++++++++++++++-----------------------
1 file changed, 19 insertions(+), 26 deletions(-)
-diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
-index 1b68d20..3e0fe55 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
-@@ -414,11 +414,9 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
+@@ -417,11 +417,9 @@ static void handle_thermal_trip(struct t
int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
{
int ret = -EINVAL;
if (!tz || IS_ERR(tz) || !tz->ops->get_temp)
goto exit;
-@@ -426,25 +424,21 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
+@@ -429,25 +427,21 @@ int thermal_zone_get_temp(struct thermal
mutex_lock(&tz->lock);
ret = tz->ops->get_temp(tz, temp);
mutex_unlock(&tz->lock);
exit:
return ret;
-@@ -780,7 +774,6 @@ policy_show(struct device *dev, struct device_attribute *devattr, char *buf)
+@@ -800,7 +794,6 @@ policy_show(struct device *dev, struct d
return sprintf(buf, "%s\n", tz->governor->name);
}
static ssize_t
emul_temp_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
-@@ -806,7 +799,6 @@ emul_temp_store(struct device *dev, struct device_attribute *attr,
+@@ -826,7 +819,6 @@ emul_temp_store(struct device *dev, stru
return ret ? ret : count;
}
static DEVICE_ATTR(emul_temp, S_IWUSR, NULL, emul_temp_store);
static DEVICE_ATTR(type, 0444, type_show, NULL);
static DEVICE_ATTR(temp, 0444, temp_show, NULL);
-@@ -1536,11 +1528,12 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
+@@ -1566,11 +1558,12 @@ struct thermal_zone_device *thermal_zone
goto unregister;
}
/* Create policy attribute */
result = device_create_file(&tz->device, &dev_attr_policy);
if (result)
---
-1.7.10.4
-