thermal: core: split policy_store

Similarly to passive_store, policy_store now is split
between thermal core data structure handling and sysfs handling.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 4e315c979f89bac0f6ee1a9ff8fe49aa47b2318d..23f138f7eb68b386094e0cec3c46963c132f18a6 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -757,6 +757,28 @@ void thermal_zone_device_unbind_exception(struct thermal_zone_device *tz,
        mutex_unlock(&thermal_list_lock);
 }
 
+int thermal_zone_device_set_policy(struct thermal_zone_device *tz,
+                                  char *policy)
+{
+       struct thermal_governor *gov;
+       int ret = -EINVAL;
+
+       mutex_lock(&thermal_governor_lock);
+       mutex_lock(&tz->lock);
+
+       gov = __find_governor(strim(policy));
+       if (!gov)
+               goto exit;
+
+       ret = thermal_set_governor(tz, gov);
+
+exit:
+       mutex_unlock(&tz->lock);
+       mutex_unlock(&thermal_governor_lock);
+
+       return ret;
+}
+
 /* sys I/F for thermal zone */
 
 #define to_thermal_zone(_dev) \
@@ -1001,27 +1023,16 @@ static ssize_t
 policy_store(struct device *dev, struct device_attribute *attr,
                    const char *buf, size_t count)
 {
-       int ret = -EINVAL;
        struct thermal_zone_device *tz = to_thermal_zone(dev);
-       struct thermal_governor *gov;
        char name[THERMAL_NAME_LENGTH];
+       int ret;
 
        snprintf(name, sizeof(name), "%s", buf);
 
-       mutex_lock(&thermal_governor_lock);
-       mutex_lock(&tz->lock);
-
-       gov = __find_governor(strim(name));
-       if (!gov)
-               goto exit;
-
-       ret = thermal_set_governor(tz, gov);
+       ret = thermal_zone_device_set_policy(tz, name);
        if (!ret)
                ret = count;
 
-exit:
-       mutex_unlock(&tz->lock);
-       mutex_unlock(&thermal_governor_lock);
        return ret;
 }
 

diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index a765c753c62ce605f1d01065febb2c160c90f8ff..db65d3b08cf71cba3a0098d51a64a3e6cccfd311 100644 (file)
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -60,6 +60,7 @@ void thermal_zone_device_rebind_exception(struct thermal_zone_device *,
                                          const char *, size_t);
 void thermal_zone_device_unbind_exception(struct thermal_zone_device *,
                                          const char *, size_t);
+int thermal_zone_device_set_policy(struct thermal_zone_device *, char *);
 
 #ifdef CONFIG_THERMAL_GOV_STEP_WISE
 int thermal_gov_step_wise_register(void);