diff options
author | Tomasz Figa <t.figa@samsung.com> | 2014-03-17 18:28:10 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-03-20 15:09:26 -0400 |
commit | f682426630c620a2b8ae488a4f0d85ec6c272d66 (patch) | |
tree | 3325cd958d64f0feb954ce4926894c495d3320f6 /arch/arm | |
parent | b27899178c53226a5ff780a17657c84eb5e32338 (diff) |
ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h
To allow using Samsung PM memory check helpers on platforms that do not
use the legacy Samsung PM core, this patch moves prototypes of relevant
functions to plat/pm-common.h header.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/pm-common.h | 14 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/pm.h | 14 | ||||
-rw-r--r-- | arch/arm/plat-samsung/pm-check.c | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/plat-samsung/include/plat/pm-common.h b/arch/arm/plat-samsung/include/plat/pm-common.h index 741723eb8cd7..8705f9e0e288 100644 --- a/arch/arm/plat-samsung/include/plat/pm-common.h +++ b/arch/arm/plat-samsung/include/plat/pm-common.h | |||
@@ -93,4 +93,18 @@ static inline void s3c_pm_save_uarts(void) { } | |||
93 | static inline void s3c_pm_restore_uarts(void) { } | 93 | static inline void s3c_pm_restore_uarts(void) { } |
94 | #endif | 94 | #endif |
95 | 95 | ||
96 | /* suspend memory checking */ | ||
97 | |||
98 | #ifdef CONFIG_SAMSUNG_PM_CHECK | ||
99 | extern void s3c_pm_check_prepare(void); | ||
100 | extern void s3c_pm_check_restore(void); | ||
101 | extern void s3c_pm_check_cleanup(void); | ||
102 | extern void s3c_pm_check_store(void); | ||
103 | #else | ||
104 | #define s3c_pm_check_prepare() do { } while (0) | ||
105 | #define s3c_pm_check_restore() do { } while (0) | ||
106 | #define s3c_pm_check_cleanup() do { } while (0) | ||
107 | #define s3c_pm_check_store() do { } while (0) | ||
108 | #endif | ||
109 | |||
96 | #endif | 110 | #endif |
diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h index 4099e8d6f5f9..e17d871b934c 100644 --- a/arch/arm/plat-samsung/include/plat/pm.h +++ b/arch/arm/plat-samsung/include/plat/pm.h | |||
@@ -80,20 +80,6 @@ extern void s3c_pm_debug_smdkled(u32 set, u32 clear); | |||
80 | static inline void s3c_pm_debug_smdkled(u32 set, u32 clear) { } | 80 | static inline void s3c_pm_debug_smdkled(u32 set, u32 clear) { } |
81 | #endif /* CONFIG_S3C_PM_DEBUG_LED_SMDK */ | 81 | #endif /* CONFIG_S3C_PM_DEBUG_LED_SMDK */ |
82 | 82 | ||
83 | /* suspend memory checking */ | ||
84 | |||
85 | #ifdef CONFIG_SAMSUNG_PM_CHECK | ||
86 | extern void s3c_pm_check_prepare(void); | ||
87 | extern void s3c_pm_check_restore(void); | ||
88 | extern void s3c_pm_check_cleanup(void); | ||
89 | extern void s3c_pm_check_store(void); | ||
90 | #else | ||
91 | #define s3c_pm_check_prepare() do { } while(0) | ||
92 | #define s3c_pm_check_restore() do { } while(0) | ||
93 | #define s3c_pm_check_cleanup() do { } while(0) | ||
94 | #define s3c_pm_check_store() do { } while(0) | ||
95 | #endif | ||
96 | |||
97 | /** | 83 | /** |
98 | * s3c_pm_configure_extint() - ensure pins are correctly set for IRQ | 84 | * s3c_pm_configure_extint() - ensure pins are correctly set for IRQ |
99 | * | 85 | * |
diff --git a/arch/arm/plat-samsung/pm-check.c b/arch/arm/plat-samsung/pm-check.c index 3cbd62666b1e..04aff2c31b46 100644 --- a/arch/arm/plat-samsung/pm-check.c +++ b/arch/arm/plat-samsung/pm-check.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
21 | 21 | ||
22 | #include <plat/pm.h> | 22 | #include <plat/pm-common.h> |
23 | 23 | ||
24 | #if CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE < 1 | 24 | #if CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE < 1 |
25 | #error CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE must be a positive non-zero value | 25 | #error CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE must be a positive non-zero value |