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

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

PM: suspend: Rename pm_suspend_via_s2idle() 



The name of pm_suspend_via_s2idle() is confusing, as it doesn't
reflect the purpose of the function precisely enough and it is
very similar to pm_suspend_via_firmware(), which has a different
purpose, so rename it as pm_suspend_default_s2idle() and update
its only caller, i8042_register_ports(), accordingly.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 3540d38d

drivers/input/serio/i8042.c

+1 −1
Original line number Diff line number Diff line
@@ -1410,7 +1410,7 @@ static void __init i8042_register_ports(void) 
		 * behavior on many platforms using suspend-to-RAM (ACPI S3)

		 * by default.

		 */

		if (pm_suspend_via_s2idle() && i == I8042_KBD_PORT_NO)

		if (pm_suspend_default_s2idle() && i == I8042_KBD_PORT_NO)

			device_set_wakeup_enable(&serio->dev, true);

	}

}

include/linux/suspend.h

+2 −2
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static inline bool idle_should_enter_s2idle(void) 
	return unlikely(s2idle_state == S2IDLE_STATE_ENTER);

}



extern bool pm_suspend_via_s2idle(void);

extern bool pm_suspend_default_s2idle(void);

extern void __init pm_states_init(void);

extern void s2idle_set_ops(const struct platform_s2idle_ops *ops);

extern void s2idle_wake(void);
@@ -314,7 +314,7 @@ static inline void pm_set_suspend_via_firmware(void) {} 
static inline void pm_set_resume_via_firmware(void) {}

static inline bool pm_suspend_via_firmware(void) { return false; }

static inline bool pm_resume_via_firmware(void) { return false; }

static inline bool pm_suspend_via_s2idle(void) { return false; }

static inline bool pm_suspend_default_s2idle(void) { return false; }



static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {}

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

kernel/power/suspend.c

+3 −3
Original line number Diff line number Diff line
@@ -62,16 +62,16 @@ enum s2idle_states __read_mostly s2idle_state; 
static DEFINE_RAW_SPINLOCK(s2idle_lock);



/**

 * pm_suspend_via_s2idle - Check if suspend-to-idle is the default suspend.

 * pm_suspend_default_s2idle - Check if suspend-to-idle is the default suspend.

 *

 * Return 'true' if suspend-to-idle has been selected as the default system

 * suspend method.

 */

bool pm_suspend_via_s2idle(void)

bool pm_suspend_default_s2idle(void)

{

	return mem_sleep_current == PM_SUSPEND_TO_IDLE;

}

EXPORT_SYMBOL_GPL(pm_suspend_via_s2idle);

EXPORT_SYMBOL_GPL(pm_suspend_default_s2idle);



void s2idle_set_ops(const struct platform_s2idle_ops *ops)

{