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

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

thermal: core: move __bind() 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 9b68ef89

drivers/thermal/thermal_core.c

+33 −33
Original line number Diff line number Diff line
@@ -286,39 +286,6 @@ static void thermal_unregister_governors(void) 
	thermal_gov_power_allocator_unregister();

}



static void print_bind_err_msg(struct thermal_zone_device *tz,

			       struct thermal_cooling_device *cdev, int ret)

{

	dev_err(&tz->device, "binding zone %s with cdev %s failed:%d\n",

		tz->type, cdev->type, ret);

}



static void __bind(struct thermal_zone_device *tz, int mask,

		   struct thermal_cooling_device *cdev,

		   unsigned long *limits,

		   unsigned int weight)

{

	int i, ret;



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

		if (mask & (1 << i)) {

			unsigned long upper, lower;



			upper = THERMAL_NO_LIMIT;

			lower = THERMAL_NO_LIMIT;

			if (limits) {

				lower = limits[i * 2];

				upper = limits[i * 2 + 1];

			}

			ret = thermal_zone_bind_cooling_device(tz, i, cdev,

							       upper, lower,

							       weight);

			if (ret)

				print_bind_err_msg(tz, cdev, ret);

		}

	}

}



static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,

					    int delay)

{
@@ -811,6 +778,39 @@ static struct class thermal_class = { 
	.dev_release = thermal_release,

};



static void print_bind_err_msg(struct thermal_zone_device *tz,

			       struct thermal_cooling_device *cdev, int ret)

{

	dev_err(&tz->device, "binding zone %s with cdev %s failed:%d\n",

		tz->type, cdev->type, ret);

}



static void __bind(struct thermal_zone_device *tz, int mask,

		   struct thermal_cooling_device *cdev,

		   unsigned long *limits,

		   unsigned int weight)

{

	int i, ret;



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

		if (mask & (1 << i)) {

			unsigned long upper, lower;



			upper = THERMAL_NO_LIMIT;

			lower = THERMAL_NO_LIMIT;

			if (limits) {

				lower = limits[i * 2];

				upper = limits[i * 2 + 1];

			}

			ret = thermal_zone_bind_cooling_device(tz, i, cdev,

							       upper, lower,

							       weight);

			if (ret)

				print_bind_err_msg(tz, cdev, ret);

		}

	}

}



static void bind_cdev(struct thermal_cooling_device *cdev)

{

	int i, ret;