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

Commit 32e8d689 authored by Todd E Brandt's avatar Todd E Brandt Committed by Rafael J. Wysocki
Browse files

PM / sleep: trace_device_pm_callback coverage in dpm_prepare/complete 



Move the trace_device_pm_callback locations for dpm_prepare and dpm_complete
to encompass the attempt to capture the device mutex prior to callback. This
is needed by analyze_suspend to identify gaps in the trace output caused by
the delay in locking the mutex for a device.

Signed-off-by: default avatarTodd Brandt <todd.e.brandt@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7f436055

drivers/base/power/main.c

+5 −6
Original line number Diff line number Diff line
@@ -920,9 +920,7 @@ static void device_complete(struct device *dev, pm_message_t state) 


	if (callback) {

		pm_dev_dbg(dev, state, info);

		trace_device_pm_callback_start(dev, info, state.event);

		callback(dev);

		trace_device_pm_callback_end(dev, 0);

	}



	device_unlock(dev);
@@ -954,7 +952,9 @@ void dpm_complete(pm_message_t state) 
		list_move(&dev->power.entry, &list);

		mutex_unlock(&dpm_list_mtx);



		trace_device_pm_callback_start(dev, "", state.event);

		device_complete(dev, state);

		trace_device_pm_callback_end(dev, 0);



		mutex_lock(&dpm_list_mtx);

		put_device(dev);
@@ -1585,11 +1585,8 @@ static int device_prepare(struct device *dev, pm_message_t state) 
		callback = dev->driver->pm->prepare;

	}



	if (callback) {

		trace_device_pm_callback_start(dev, info, state.event);

	if (callback)

		ret = callback(dev);

		trace_device_pm_callback_end(dev, ret);

	}



	device_unlock(dev);
@@ -1631,7 +1628,9 @@ int dpm_prepare(pm_message_t state) 
		get_device(dev);

		mutex_unlock(&dpm_list_mtx);



		trace_device_pm_callback_start(dev, "", state.event);

		error = device_prepare(dev, state);

		trace_device_pm_callback_end(dev, error);



		mutex_lock(&dpm_list_mtx);

		if (error) {