Commit a5a98a78 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

thermal: core: Add and use cooling device guard 



Add and use a special guard for cooling devices.

This allows quite a few error code paths to be simplified among
other things and brings in code size reduction for a good measure.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/5837621.DvuYhMxLoT@rjwysocki.net


Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
parent c597b4e7

drivers/thermal/gov_power_allocator.c

+11 −12
Original line number Diff line number Diff line
@@ -549,18 +549,17 @@ static void allow_maximum_power(struct thermal_zone_device *tz) 
		cdev = instance->cdev;



		instance->target = 0;

		mutex_lock(&cdev->lock);

		scoped_guard(cooling_dev, cdev) {

			/*

		 * Call for updating the cooling devices local stats and avoid

		 * periods of dozen of seconds when those have not been

		 * maintained.

			 * Call for updating the cooling devices local stats and

			 * avoid periods of dozen of seconds when those have not

			 * been maintained.

			 */

			cdev->ops->get_requested_power(cdev, &req_power);



			if (params->update_cdevs)

				__thermal_cdev_update(cdev);



		mutex_unlock(&cdev->lock);

		}

	}

}

drivers/thermal/gov_step_wise.c

+3 −3
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, 


		instance->initialized = true;



		mutex_lock(&instance->cdev->lock);

		scoped_guard(cooling_dev, instance->cdev) {

			instance->cdev->updated = false; /* cdev needs update */

		mutex_unlock(&instance->cdev->lock);

		}

	}

}

drivers/thermal/thermal_core.c

+5 −12
Original line number Diff line number Diff line
@@ -758,12 +758,10 @@ static int thermal_instance_add(struct thermal_instance *new_instance, 


	list_add_tail(&new_instance->trip_node, &td->thermal_instances);



	mutex_lock(&cdev->lock);

	guard(cooling_dev)(cdev);



	list_add_tail(&new_instance->cdev_node, &cdev->thermal_instances);



	mutex_unlock(&cdev->lock);



	return 0;

}
@@ -872,11 +870,9 @@ static void thermal_instance_delete(struct thermal_instance *instance) 
{

	list_del(&instance->trip_node);



	mutex_lock(&instance->cdev->lock);

	guard(cooling_dev)(instance->cdev);



	list_del(&instance->cdev_node);



	mutex_unlock(&instance->cdev->lock);

}



/**
@@ -1239,10 +1235,10 @@ void thermal_cooling_device_update(struct thermal_cooling_device *cdev) 
	 * Update under the cdev lock to prevent the state from being set beyond

	 * the new limit concurrently.

	 */

	mutex_lock(&cdev->lock);

	guard(cooling_dev)(cdev);



	if (cdev->ops->get_max_state(cdev, &cdev->max_state))

		goto unlock;

		return;



	thermal_cooling_device_stats_reinit(cdev);
@@ -1269,12 +1265,9 @@ void thermal_cooling_device_update(struct thermal_cooling_device *cdev) 
	}



	if (cdev->ops->get_cur_state(cdev, &state) || state > cdev->max_state)

		goto unlock;

		return;



	thermal_cooling_device_stats_update(cdev, state);



unlock:

	mutex_unlock(&cdev->lock);

}

EXPORT_SYMBOL_GPL(thermal_cooling_device_update);

drivers/thermal/thermal_debugfs.c

+15 −10
Original line number Diff line number Diff line
@@ -516,6 +516,19 @@ void thermal_debug_cdev_add(struct thermal_cooling_device *cdev, int state) 
	cdev->debugfs = thermal_dbg;

}



static struct thermal_debugfs *thermal_debug_cdev_clear(struct thermal_cooling_device *cdev)

{

	struct thermal_debugfs *thermal_dbg;



	guard(cooling_dev)(cdev);



	thermal_dbg = cdev->debugfs;

	if (thermal_dbg)

		cdev->debugfs = NULL;



	return thermal_dbg;

}



/**

 * thermal_debug_cdev_remove - Remove a cooling device debugfs entry

 *
@@ -527,17 +540,9 @@ void thermal_debug_cdev_remove(struct thermal_cooling_device *cdev) 
{

	struct thermal_debugfs *thermal_dbg;



	mutex_lock(&cdev->lock);



	thermal_dbg = cdev->debugfs;

	if (!thermal_dbg) {

		mutex_unlock(&cdev->lock);

	thermal_dbg = thermal_debug_cdev_clear(cdev);

	if (!thermal_dbg)

		return;

	}



	cdev->debugfs = NULL;



	mutex_unlock(&cdev->lock);



	mutex_lock(&thermal_dbg->lock);

drivers/thermal/thermal_helpers.c

+5 −14
Original line number Diff line number Diff line
@@ -58,17 +58,10 @@ bool thermal_trip_is_bound_to_cdev(struct thermal_zone_device *tz, 
				   const struct thermal_trip *trip,

				   struct thermal_cooling_device *cdev)

{

	bool ret;



	guard(thermal_zone)(tz);

	guard(cooling_dev)(cdev);



	mutex_lock(&cdev->lock);



	ret = thermal_instance_present(tz, cdev, trip);



	mutex_unlock(&cdev->lock);



	return ret;

	return thermal_instance_present(tz, cdev, trip);

}

EXPORT_SYMBOL_GPL(thermal_trip_is_bound_to_cdev);
@@ -197,12 +190,12 @@ void __thermal_cdev_update(struct thermal_cooling_device *cdev) 
 */

void thermal_cdev_update(struct thermal_cooling_device *cdev)

{

	mutex_lock(&cdev->lock);

	guard(cooling_dev)(cdev);



	if (!cdev->updated) {

		__thermal_cdev_update(cdev);

		cdev->updated = true;

	}

	mutex_unlock(&cdev->lock);

}



/**
@@ -211,11 +204,9 @@ void thermal_cdev_update(struct thermal_cooling_device *cdev) 
 */

void thermal_cdev_update_nocheck(struct thermal_cooling_device *cdev)

{

	mutex_lock(&cdev->lock);

	guard(cooling_dev)(cdev);



	__thermal_cdev_update(cdev);



	mutex_unlock(&cdev->lock);

}



/**