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

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

PM / Sleep: Drop suspend_stats_update() 



Since suspend_stats_update() is only called from pm_suspend(),
move its code directly into that function and remove the static
inline definition from include/linux/suspend.h.  Clean_up
pm_suspend() in the process.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
parent 93e1ee43

include/linux/suspend.h

+0 −16
Original line number Diff line number Diff line
@@ -94,22 +94,6 @@ static inline void dpm_save_failed_step(enum suspend_stat_step step) 
	suspend_stats.last_failed_step %= REC_FAILED_NUM;

}



/**

 * suspend_stats_update - Update success/failure statistics of suspend-to-ram

 *

 * @error: Value returned by enter_state() function

 */

static inline void suspend_stats_update(int error)

{

	if (error) {

		suspend_stats.fail++;

		dpm_save_failed_errno(error);

	} else {

		suspend_stats.success++;

	}

}





/**

 * struct platform_suspend_ops - Callbacks for managing platform dependent

 *	system sleep states.

kernel/power/suspend.c

+12 −6
Original line number Diff line number Diff line
@@ -316,12 +316,18 @@ static int enter_state(suspend_state_t state) 
 */

int pm_suspend(suspend_state_t state)

{

	int ret;

	if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX) {

		ret = enter_state(state);

		suspend_stats_update(ret);

		return ret;

	}

	int error;



	if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)

		return -EINVAL;



	error = enter_state(state);

	if (error) {

		suspend_stats.fail++;

		dpm_save_failed_errno(error);

	} else {

		suspend_stats.success++;

	}

	return error;

}

EXPORT_SYMBOL(pm_suspend);