Commit 2e41e3ca authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Rafael J. Wysocki
Browse files

PM: suspend: Fix pm_suspend_target_state handling for !CONFIG_PM 



Move the pm_suspend_target_state definition for CONFIG_SUSPEND
unset from the wakeup code into the headers so as to allow it
to still be used elsewhere when CONFIG_SUSPEND is not set.

Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
[ rjw: Changelog and subject edits ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 44c026a7

drivers/base/power/wakeup.c

+0 −5
Original line number Diff line number Diff line
@@ -19,11 +19,6 @@ 


#include "power.h"



#ifndef CONFIG_SUSPEND

suspend_state_t pm_suspend_target_state;

#define pm_suspend_target_state	(PM_SUSPEND_ON)

#endif



#define list_for_each_entry_rcu_locked(pos, head, member) \

	list_for_each_entry_rcu(pos, head, member, \

		srcu_read_lock_held(&wakeup_srcu))

include/linux/suspend.h

+3 −1
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ struct platform_s2idle_ops { 
};



#ifdef CONFIG_SUSPEND

extern suspend_state_t pm_suspend_target_state;

extern suspend_state_t mem_sleep_current;

extern suspend_state_t mem_sleep_default;
@@ -337,6 +338,8 @@ extern bool sync_on_suspend_enabled; 
#else /* !CONFIG_SUSPEND */

#define suspend_valid_only_mem	NULL



#define pm_suspend_target_state	(PM_SUSPEND_ON)



static inline void pm_suspend_clear_flags(void) {}

static inline void pm_set_suspend_via_firmware(void) {}

static inline void pm_set_resume_via_firmware(void) {}
@@ -503,7 +506,6 @@ extern void pm_report_max_hw_sleep(u64 t); 


/* drivers/base/power/wakeup.c */

extern bool events_check_enabled;

extern suspend_state_t pm_suspend_target_state;



extern bool pm_wakeup_pending(void);

extern void pm_system_wakeup(void);