| Message ID | 1392811761-28201-1-git-send-email-ulf.hansson@linaro.org |
|---|---|
| State | Accepted |
| Commit | 0a9efc4d91df7b18fb3e97c24ee85a1529618899 |
| Headers | show |
On 19 February 2014 13:27, Pavel Machek <pavel@ucw.cz> wrote: > On Wed 2014-02-19 13:09:21, Ulf Hansson wrote: >> Previously only a subset of the functions were defined and set to NULL >> while !CONFIG_PM_SLEEP. Let's make them all available so they can be >> used no matter of CONFIG_PM_SLEEP or not. >> >> Cc: Russell King <linux@arm.linux.org.uk> >> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > > Reviewed-by: Pavel Machek <pavel@ucw.cz> > Hi Rafael, If you have no concern with this one, I would appreciate if it could go in for 3.15. I have some patches for the amba bus (driver/amba/bus.c) that would require these pointers to be available. Kind regards Uffe > -- > (english) http://www.livejournal.com/~pavelmachek > (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thursday, February 27, 2014 09:29:31 AM Ulf Hansson wrote: > On 19 February 2014 13:27, Pavel Machek <pavel@ucw.cz> wrote: > > On Wed 2014-02-19 13:09:21, Ulf Hansson wrote: > >> Previously only a subset of the functions were defined and set to NULL > >> while !CONFIG_PM_SLEEP. Let's make them all available so they can be > >> used no matter of CONFIG_PM_SLEEP or not. > >> > >> Cc: Russell King <linux@arm.linux.org.uk> > >> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > > > > Reviewed-by: Pavel Machek <pavel@ucw.cz> > > > > Hi Rafael, > > If you have no concern with this one, I would appreciate if it could > go in for 3.15. > > I have some patches for the amba bus (driver/amba/bus.c) that would > require these pointers to be available. I've queued it up for 3.15, thanks!
diff --git a/include/linux/pm.h b/include/linux/pm.h index db2be5f..a81b558 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -718,14 +718,26 @@ static inline void dpm_for_each_dev(void *data, void (*fn)(struct device *, void { } -#define pm_generic_prepare NULL -#define pm_generic_suspend NULL -#define pm_generic_resume NULL -#define pm_generic_freeze NULL -#define pm_generic_thaw NULL -#define pm_generic_restore NULL -#define pm_generic_poweroff NULL -#define pm_generic_complete NULL +#define pm_generic_prepare NULL +#define pm_generic_suspend_late NULL +#define pm_generic_suspend_noirq NULL +#define pm_generic_suspend NULL +#define pm_generic_resume_early NULL +#define pm_generic_resume_noirq NULL +#define pm_generic_resume NULL +#define pm_generic_freeze_noirq NULL +#define pm_generic_freeze_late NULL +#define pm_generic_freeze NULL +#define pm_generic_thaw_noirq NULL +#define pm_generic_thaw_early NULL +#define pm_generic_thaw NULL +#define pm_generic_restore_noirq NULL +#define pm_generic_restore_early NULL +#define pm_generic_restore NULL +#define pm_generic_poweroff_noirq NULL +#define pm_generic_poweroff_late NULL +#define pm_generic_poweroff NULL +#define pm_generic_complete NULL #endif /* !CONFIG_PM_SLEEP */ /* How to reorder dpm_list after device_move() */
Previously only a subset of the functions were defined and set to NULL while !CONFIG_PM_SLEEP. Let's make them all available so they can be used no matter of CONFIG_PM_SLEEP or not. Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- include/linux/pm.h | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)