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

Commit 79e5421c authored by Sascha Hauer's avatar Sascha Hauer Committed by Zhang Rui
Browse files

thermal: Use IS_ENABLED instead of #ifdef 



Use IS_ENABLED(CONFIG_THERMAL_EMULATION) to make the code more readable
and to get rid of the addtional #ifdef around the variable definitions
in thermal_zone_get_temp().

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: default avatarLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent dbdf2532

drivers/thermal/thermal_core.c

+19 −26
Original line number Diff line number Diff line
@@ -477,11 +477,9 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) 
int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)

{

	int ret = -EINVAL;

#ifdef CONFIG_THERMAL_EMULATION

	int count;

	int crit_temp = INT_MAX;

	enum thermal_trip_type type;

#endif



	if (!tz || IS_ERR(tz) || !tz->ops->get_temp)

		goto exit;
@@ -489,25 +487,21 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) 
	mutex_lock(&tz->lock);



	ret = tz->ops->get_temp(tz, temp);

#ifdef CONFIG_THERMAL_EMULATION

	if (!tz->emul_temperature)

		goto skip_emul;



	if (IS_ENABLED(CONFIG_THERMAL_EMULATION) && tz->emul_temperature) {

		for (count = 0; count < tz->trips; count++) {

			ret = tz->ops->get_trip_type(tz, count, &type);

			if (!ret && type == THERMAL_TRIP_CRITICAL) {

			ret = tz->ops->get_trip_temp(tz, count, &crit_temp);

				ret = tz->ops->get_trip_temp(tz, count,

						&crit_temp);

				break;

			}

		}



	if (ret)

		goto skip_emul;



	if (*temp < crit_temp)

		if (!ret && *temp < crit_temp)

			*temp = tz->emul_temperature;

skip_emul:

#endif

	}

 

	mutex_unlock(&tz->lock);

exit:

	return ret;
@@ -866,7 +860,6 @@ available_policies_show(struct device *dev, struct device_attribute *devattr, 
	return count;

}



#ifdef CONFIG_THERMAL_EMULATION

static ssize_t

emul_temp_store(struct device *dev, struct device_attribute *attr,

		     const char *buf, size_t count)
@@ -892,7 +885,6 @@ emul_temp_store(struct device *dev, struct device_attribute *attr, 
	return ret ? ret : count;

}

static DEVICE_ATTR(emul_temp, S_IWUSR, NULL, emul_temp_store);

#endif/*CONFIG_THERMAL_EMULATION*/



static ssize_t

sustainable_power_show(struct device *dev, struct device_attribute *devattr,
@@ -1822,11 +1814,12 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, 
			goto unregister;

	}



#ifdef CONFIG_THERMAL_EMULATION

	if (IS_ENABLED(CONFIG_THERMAL_EMULATION)) {

		result = device_create_file(&tz->device, &dev_attr_emul_temp);

		if (result)

			goto unregister;

#endif

	}



	/* Create policy attribute */

	result = device_create_file(&tz->device, &dev_attr_policy);

	if (result)