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

Commit 9e584a4f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Greg Kroah-Hartman
Browse files

PM: Simplify suspend_device 



Reduce code duplication in drivers/base/suspend.c by introducing a separate
function for printing diagnostic messages.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cc490069

drivers/base/power/suspend.c

+18 −31
Original line number Diff line number Diff line
@@ -40,6 +40,14 @@ static inline char *suspend_verb(u32 event) 
}





static void

suspend_device_dbg(struct device *dev, pm_message_t state, char *info)

{

	dev_dbg(dev, "%s%s%s\n", info, suspend_verb(state.event),

		((state.event == PM_EVENT_SUSPEND) && device_may_wakeup(dev)) ?

		", may wakeup" : "");

}



/**

 *	suspend_device - Save state of one device.

 *	@dev:	Device.
@@ -66,37 +74,21 @@ int suspend_device(struct device * dev, pm_message_t state) 
	dev->power.prev_state = dev->power.power_state;



	if (dev->class && dev->class->suspend && !dev->power.power_state.event) {

		dev_dbg(dev, "class %s%s\n",

			suspend_verb(state.event),

			((state.event == PM_EVENT_SUSPEND)

					&& device_may_wakeup(dev))

				? ", may wakeup"

				: ""

			);

		suspend_device_dbg(dev, state, "class ");

		error = dev->class->suspend(dev, state);

		suspend_report_result(dev->class->suspend, error);

	}



	if (!error && dev->type && dev->type->suspend && !dev->power.power_state.event) {

		dev_dbg(dev, "%s%s\n",

			suspend_verb(state.event),

			((state.event == PM_EVENT_SUSPEND)

					&& device_may_wakeup(dev))

				? ", may wakeup"

				: ""

			);

	if (!error && dev->type && dev->type->suspend

	    && !dev->power.power_state.event) {

		suspend_device_dbg(dev, state, "type ");

		error = dev->type->suspend(dev, state);

		suspend_report_result(dev->type->suspend, error);

	}



	if (!error && dev->bus && dev->bus->suspend && !dev->power.power_state.event) {

		dev_dbg(dev, "%s%s\n",

			suspend_verb(state.event),

			((state.event == PM_EVENT_SUSPEND)

					&& device_may_wakeup(dev))

				? ", may wakeup"

				: ""

			);

	if (!error && dev->bus && dev->bus->suspend

	    && !dev->power.power_state.event) {

		suspend_device_dbg(dev, state, "");

		error = dev->bus->suspend(dev, state);

		suspend_report_result(dev->bus->suspend, error);

	}
@@ -114,14 +106,9 @@ static int suspend_device_late(struct device *dev, pm_message_t state) 
{

	int error = 0;



	if (dev->bus && dev->bus->suspend_late && !dev->power.power_state.event) {

		dev_dbg(dev, "LATE %s%s\n",

			suspend_verb(state.event),

			((state.event == PM_EVENT_SUSPEND)

					&& device_may_wakeup(dev))

				? ", may wakeup"

				: ""

			);

	if (dev->bus && dev->bus->suspend_late

	    && !dev->power.power_state.event) {

		suspend_device_dbg(dev, state, "LATE ");

		error = dev->bus->suspend_late(dev, state);

		suspend_report_result(dev->bus->suspend_late, error);

	}