commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=7a7e100fc9cfc23b452737e0aa5a79f9612324db branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
move bfin common pm defination to asm/pm.h Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]> --- .../{mach-bf609/include/mach => include/asm}/pm.h | 10 ++-------- arch/blackfin/mach-bf609/include/mach/pm.h | 11 ----------- arch/blackfin/mach-common/pm.c | 7 +++++-- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/arch/blackfin/mach-bf609/include/mach/pm.h b/arch/blackfin/include/asm/pm.h similarity index 66% copy from arch/blackfin/mach-bf609/include/mach/pm.h copy to arch/blackfin/include/asm/pm.h index 4a687cd..e9537ff 100644 --- a/arch/blackfin/mach-bf609/include/mach/pm.h +++ b/arch/blackfin/include/asm/pm.h @@ -6,8 +6,8 @@ * Licensed under the GPL-2 */ -#ifndef __MACH_BF609_PM_H__ -#define __MACH_BF609_PM_H__ +#ifndef __PM_H__ +#define __PM_H__ #include <linux/suspend.h> @@ -21,10 +21,4 @@ struct bfin_cpu_pm_fns { }; extern struct bfin_cpu_pm_fns *bfin_cpu_pm; - -extern int bfin609_pm_enter(suspend_state_t state); -extern int bf609_pm_prepare(void); -extern void bf609_pm_finish(void); - -extern void bf609_hibernate(void); #endif diff --git a/arch/blackfin/mach-bf609/include/mach/pm.h b/arch/blackfin/mach-bf609/include/mach/pm.h index 4a687cd..7bbb265 100644 --- a/arch/blackfin/mach-bf609/include/mach/pm.h +++ b/arch/blackfin/mach-bf609/include/mach/pm.h @@ -11,17 +11,6 @@ #include <linux/suspend.h> -struct bfin_cpu_pm_fns { - void (*save)(unsigned long *); - void (*restore)(unsigned long *); - int (*valid)(suspend_state_t state); - void (*enter)(suspend_state_t state); - int (*prepare)(void); - void (*finish)(void); -}; - -extern struct bfin_cpu_pm_fns *bfin_cpu_pm; - extern int bfin609_pm_enter(suspend_state_t state); extern int bf609_pm_prepare(void); extern void bf609_pm_finish(void); diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c index ebe2ebd..8b8b4a4 100644 --- a/arch/blackfin/mach-common/pm.c +++ b/arch/blackfin/mach-common/pm.c @@ -19,8 +19,7 @@ #include <asm/gpio.h> #include <asm/dma.h> #include <asm/dpmc.h> - -#include <mach/pm.h> +#include <asm/pm.h> #ifdef CONFIG_BF60x struct bfin_cpu_pm_fns *bfin_cpu_pm; @@ -28,7 +27,9 @@ struct bfin_cpu_pm_fns *bfin_cpu_pm; void bfin_pm_suspend_standby_enter(void) { +#ifndef CONFIG_BF60x bfin_pm_standby_setup(); +#endif #ifdef CONFIG_BF60x bfin_cpu_pm->enter(PM_SUSPEND_STANDBY); @@ -40,7 +41,9 @@ void bfin_pm_suspend_standby_enter(void) # endif #endif +#ifndef CONFIG_BF60x bfin_pm_standby_restore(); +#endif #ifndef CONFIG_BF60x #ifdef SIC_IWR0
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
