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

Commit 90f5b5bb authored by Eduardo Valentin's avatar Eduardo Valentin Committed by Zhang Rui
Browse files

thermal: core: move bind_tz() to where it is used 



Moving the helper to closer where it is used.

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 949aad83

drivers/thermal/thermal_core.c

+40 −40
Original line number Diff line number Diff line
@@ -319,46 +319,6 @@ static void __bind(struct thermal_zone_device *tz, int mask, 
	}

}



static void bind_tz(struct thermal_zone_device *tz)

{

	int i, ret;

	struct thermal_cooling_device *pos = NULL;

	const struct thermal_zone_params *tzp = tz->tzp;



	if (!tzp && !tz->ops->bind)

		return;



	mutex_lock(&thermal_list_lock);



	/* If there is ops->bind, try to use ops->bind */

	if (tz->ops->bind) {

		list_for_each_entry(pos, &thermal_cdev_list, node) {

			ret = tz->ops->bind(tz, pos);

			if (ret)

				print_bind_err_msg(tz, pos, ret);

		}

		goto exit;

	}



	if (!tzp || !tzp->tbp)

		goto exit;



	list_for_each_entry(pos, &thermal_cdev_list, node) {

		for (i = 0; i < tzp->num_tbps; i++) {

			if (tzp->tbp[i].cdev || !tzp->tbp[i].match)

				continue;

			if (tzp->tbp[i].match(tz, pos))

				continue;

			tzp->tbp[i].cdev = pos;

			__bind(tz, tzp->tbp[i].trip_mask, pos,

			       tzp->tbp[i].binding_limits,

			       tzp->tbp[i].weight);

		}

	}

exit:

	mutex_unlock(&thermal_list_lock);

}



static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,

					    int delay)

{
@@ -1094,6 +1054,46 @@ void thermal_notify_framework(struct thermal_zone_device *tz, int trip) 
}

EXPORT_SYMBOL_GPL(thermal_notify_framework);



static void bind_tz(struct thermal_zone_device *tz)

{

	int i, ret;

	struct thermal_cooling_device *pos = NULL;

	const struct thermal_zone_params *tzp = tz->tzp;



	if (!tzp && !tz->ops->bind)

		return;



	mutex_lock(&thermal_list_lock);



	/* If there is ops->bind, try to use ops->bind */

	if (tz->ops->bind) {

		list_for_each_entry(pos, &thermal_cdev_list, node) {

			ret = tz->ops->bind(tz, pos);

			if (ret)

				print_bind_err_msg(tz, pos, ret);

		}

		goto exit;

	}



	if (!tzp || !tzp->tbp)

		goto exit;



	list_for_each_entry(pos, &thermal_cdev_list, node) {

		for (i = 0; i < tzp->num_tbps; i++) {

			if (tzp->tbp[i].cdev || !tzp->tbp[i].match)

				continue;

			if (tzp->tbp[i].match(tz, pos))

				continue;

			tzp->tbp[i].cdev = pos;

			__bind(tz, tzp->tbp[i].trip_mask, pos,

			       tzp->tbp[i].binding_limits,

			       tzp->tbp[i].weight);

		}

	}

exit:

	mutex_unlock(&thermal_list_lock);

}



/**

 * thermal_zone_device_register() - register a new thermal zone device

 * @type:	the thermal zone device type