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

PM: sleep: core: Fold functions into their callers 



Fold four functions in the PM core that each have only one caller
now into their callers.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
parent 107d47b2

drivers/base/power/main.c

+60 −138
Original line number Diff line number Diff line
@@ -573,43 +573,6 @@ bool dev_pm_may_skip_resume(struct device *dev) 
	return !dev->power.must_resume && pm_transition.event != PM_EVENT_RESTORE;

}



static pm_callback_t dpm_subsys_resume_noirq_cb(struct device *dev,

						pm_message_t state,

						const char **info_p)

{

	pm_callback_t callback;

	const char *info;



	if (dev->pm_domain) {

		info = "noirq power domain ";

		callback = pm_noirq_op(&dev->pm_domain->ops, state);

	} else if (dev->type && dev->type->pm) {

		info = "noirq type ";

		callback = pm_noirq_op(dev->type->pm, state);

	} else if (dev->class && dev->class->pm) {

		info = "noirq class ";

		callback = pm_noirq_op(dev->class->pm, state);

	} else if (dev->bus && dev->bus->pm) {

		info = "noirq bus ";

		callback = pm_noirq_op(dev->bus->pm, state);

	} else {

		return NULL;

	}



	if (info_p)

		*info_p = info;



	return callback;

}



static pm_callback_t dpm_subsys_suspend_noirq_cb(struct device *dev,

						 pm_message_t state,

						 const char **info_p);



static pm_callback_t dpm_subsys_suspend_late_cb(struct device *dev,

						pm_message_t state,

						const char **info_p);



/**

 * device_resume_noirq - Execute a "noirq resume" callback for given device.

 * @dev: Device to handle.
@@ -621,8 +584,8 @@ static pm_callback_t dpm_subsys_suspend_late_cb(struct device *dev, 
 */

static int device_resume_noirq(struct device *dev, pm_message_t state, bool async)

{

	pm_callback_t callback;

	const char *info;

	pm_callback_t callback = NULL;

	const char *info = NULL;

	bool skip_resume;

	int error = 0;
@@ -638,7 +601,19 @@ static int device_resume_noirq(struct device *dev, pm_message_t state, bool asyn 
	if (!dpm_wait_for_superior(dev, async))

		goto Out;



	callback = dpm_subsys_resume_noirq_cb(dev, state, &info);

	if (dev->pm_domain) {

		info = "noirq power domain ";

		callback = pm_noirq_op(&dev->pm_domain->ops, state);

	} else if (dev->type && dev->type->pm) {

		info = "noirq type ";

		callback = pm_noirq_op(dev->type->pm, state);

	} else if (dev->class && dev->class->pm) {

		info = "noirq class ";

		callback = pm_noirq_op(dev->class->pm, state);

	} else if (dev->bus && dev->bus->pm) {

		info = "noirq bus ";

		callback = pm_noirq_op(dev->bus->pm, state);

	}

	if (callback) {

		skip_resume = false;

		goto Run;
@@ -791,35 +766,6 @@ void dpm_resume_noirq(pm_message_t state) 
	cpuidle_resume();

}



static pm_callback_t dpm_subsys_resume_early_cb(struct device *dev,

						pm_message_t state,

						const char **info_p)

{

	pm_callback_t callback;

	const char *info;



	if (dev->pm_domain) {

		info = "early power domain ";

		callback = pm_late_early_op(&dev->pm_domain->ops, state);

	} else if (dev->type && dev->type->pm) {

		info = "early type ";

		callback = pm_late_early_op(dev->type->pm, state);

	} else if (dev->class && dev->class->pm) {

		info = "early class ";

		callback = pm_late_early_op(dev->class->pm, state);

	} else if (dev->bus && dev->bus->pm) {

		info = "early bus ";

		callback = pm_late_early_op(dev->bus->pm, state);

	} else {

		return NULL;

	}



	if (info_p)

		*info_p = info;



	return callback;

}



/**

 * device_resume_early - Execute an "early resume" callback for given device.

 * @dev: Device to handle.
@@ -830,8 +776,8 @@ static pm_callback_t dpm_subsys_resume_early_cb(struct device *dev, 
 */

static int device_resume_early(struct device *dev, pm_message_t state, bool async)

{

	pm_callback_t callback;

	const char *info;

	pm_callback_t callback = NULL;

	const char *info = NULL;

	int error = 0;



	TRACE_DEVICE(dev);
@@ -846,9 +792,19 @@ static int device_resume_early(struct device *dev, pm_message_t state, bool asyn 
	if (!dpm_wait_for_superior(dev, async))

		goto Out;



	callback = dpm_subsys_resume_early_cb(dev, state, &info);



	if (!callback && dev->driver && dev->driver->pm) {

	if (dev->pm_domain) {

		info = "early power domain ";

		callback = pm_late_early_op(&dev->pm_domain->ops, state);

	} else if (dev->type && dev->type->pm) {

		info = "early type ";

		callback = pm_late_early_op(dev->type->pm, state);

	} else if (dev->class && dev->class->pm) {

		info = "early class ";

		callback = pm_late_early_op(dev->class->pm, state);

	} else if (dev->bus && dev->bus->pm) {

		info = "early bus ";

		callback = pm_late_early_op(dev->bus->pm, state);

	} else if (dev->driver && dev->driver->pm) {

		info = "early driver ";

		callback = pm_late_early_op(dev->driver->pm, state);

	}
@@ -1226,35 +1182,6 @@ static void dpm_superior_set_must_resume(struct device *dev) 
	device_links_read_unlock(idx);

}



static pm_callback_t dpm_subsys_suspend_noirq_cb(struct device *dev,

						 pm_message_t state,

						 const char **info_p)

{

	pm_callback_t callback;

	const char *info;



	if (dev->pm_domain) {

		info = "noirq power domain ";

		callback = pm_noirq_op(&dev->pm_domain->ops, state);

	} else if (dev->type && dev->type->pm) {

		info = "noirq type ";

		callback = pm_noirq_op(dev->type->pm, state);

	} else if (dev->class && dev->class->pm) {

		info = "noirq class ";

		callback = pm_noirq_op(dev->class->pm, state);

	} else if (dev->bus && dev->bus->pm) {

		info = "noirq bus ";

		callback = pm_noirq_op(dev->bus->pm, state);

	} else {

		return NULL;

	}



	if (info_p)

		*info_p = info;



	return callback;

}



/**

 * __device_suspend_noirq - Execute a "noirq suspend" callback for given device.

 * @dev: Device to handle.
@@ -1266,8 +1193,8 @@ static pm_callback_t dpm_subsys_suspend_noirq_cb(struct device *dev, 
 */

static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool async)

{

	pm_callback_t callback;

	const char *info;

	pm_callback_t callback = NULL;

	const char *info = NULL;

	int error = 0;



	TRACE_DEVICE(dev);
@@ -1281,7 +1208,19 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a 
	if (dev->power.syscore || dev->power.direct_complete)

		goto Complete;



	callback = dpm_subsys_suspend_noirq_cb(dev, state, &info);

	if (dev->pm_domain) {

		info = "noirq power domain ";

		callback = pm_noirq_op(&dev->pm_domain->ops, state);

	} else if (dev->type && dev->type->pm) {

		info = "noirq type ";

		callback = pm_noirq_op(dev->type->pm, state);

	} else if (dev->class && dev->class->pm) {

		info = "noirq class ";

		callback = pm_noirq_op(dev->class->pm, state);

	} else if (dev->bus && dev->bus->pm) {

		info = "noirq bus ";

		callback = pm_noirq_op(dev->bus->pm, state);

	}

	if (callback)

		goto Run;
@@ -1429,35 +1368,6 @@ static void dpm_propagate_wakeup_to_parent(struct device *dev) 
	spin_unlock_irq(&parent->power.lock);

}



static pm_callback_t dpm_subsys_suspend_late_cb(struct device *dev,

						pm_message_t state,

						const char **info_p)

{

	pm_callback_t callback;

	const char *info;



	if (dev->pm_domain) {

		info = "late power domain ";

		callback = pm_late_early_op(&dev->pm_domain->ops, state);

	} else if (dev->type && dev->type->pm) {

		info = "late type ";

		callback = pm_late_early_op(dev->type->pm, state);

	} else if (dev->class && dev->class->pm) {

		info = "late class ";

		callback = pm_late_early_op(dev->class->pm, state);

	} else if (dev->bus && dev->bus->pm) {

		info = "late bus ";

		callback = pm_late_early_op(dev->bus->pm, state);

	} else {

		return NULL;

	}



	if (info_p)

		*info_p = info;



	return callback;

}



/**

 * __device_suspend_late - Execute a "late suspend" callback for given device.

 * @dev: Device to handle.
@@ -1468,8 +1378,8 @@ static pm_callback_t dpm_subsys_suspend_late_cb(struct device *dev, 
 */

static int __device_suspend_late(struct device *dev, pm_message_t state, bool async)

{

	pm_callback_t callback;

	const char *info;

	pm_callback_t callback = NULL;

	const char *info = NULL;

	int error = 0;



	TRACE_DEVICE(dev);
@@ -1490,7 +1400,19 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as 
	if (dev->power.syscore || dev->power.direct_complete)

		goto Complete;



	callback = dpm_subsys_suspend_late_cb(dev, state, &info);

	if (dev->pm_domain) {

		info = "late power domain ";

		callback = pm_late_early_op(&dev->pm_domain->ops, state);

	} else if (dev->type && dev->type->pm) {

		info = "late type ";

		callback = pm_late_early_op(dev->type->pm, state);

	} else if (dev->class && dev->class->pm) {

		info = "late class ";

		callback = pm_late_early_op(dev->class->pm, state);

	} else if (dev->bus && dev->bus->pm) {

		info = "late bus ";

		callback = pm_late_early_op(dev->bus->pm, state);

	}

	if (callback)

		goto Run;