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

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

PM / Sleep: Make enter_state() in kernel/power/suspend.c static 



The enter_state() function in kernel/power/suspend.c should be
static and state_store() in kernel/power/suspend.c should call
pm_suspend() instead of it, so make that happen (which also reduces
code duplication related to suspend statistics).

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

kernel/power/main.c

+3 −5
Original line number Diff line number Diff line
@@ -291,12 +291,10 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr, 


#ifdef CONFIG_SUSPEND

	for (s = &pm_states[state]; state < PM_SUSPEND_MAX; s++, state++) {

		if (*s && len == strlen(*s) && !strncmp(buf, *s, len))

		if (*s && len == strlen(*s) && !strncmp(buf, *s, len)) {

			error = pm_suspend(state);

			break;

		}

	if (state < PM_SUSPEND_MAX && *s) {

		error = enter_state(state);

		suspend_stats_update(error);

	}

#endif

kernel/power/power.h

+0 −2
Original line number Diff line number Diff line
@@ -177,13 +177,11 @@ extern const char *const pm_states[]; 


extern bool valid_state(suspend_state_t state);

extern int suspend_devices_and_enter(suspend_state_t state);

extern int enter_state(suspend_state_t state);

#else /* !CONFIG_SUSPEND */

static inline int suspend_devices_and_enter(suspend_state_t state)

{

	return -ENOSYS;

}

static inline int enter_state(suspend_state_t state) { return -ENOSYS; }

static inline bool valid_state(suspend_state_t state) { return false; }

#endif /* !CONFIG_SUSPEND */

kernel/power/suspend.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static void suspend_finish(void) 
 * Fail if that's not the case.  Otherwise, prepare for system suspend, make the

 * system enter the given sleep state and clean up after wakeup.

 */

int enter_state(suspend_state_t state)

static int enter_state(suspend_state_t state)

{

	int error;