Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b885202 authored by Eduardo Valentin's avatar Eduardo Valentin Committed by Zhang Rui
Browse files

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: default avatarEduardo Valentin <edubezval@gmail.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 3d0055d2

drivers/thermal/thermal_core.c

+24 −13
Original line number Diff line number Diff line
@@ -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;

}

drivers/thermal/thermal_core.h

+1 −0
Original line number Diff line number Diff line
@@ -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);