diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-s5p/pm.c | 11 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/pm-check.c | 6 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/pm.c | 5 |
3 files changed, 3 insertions, 19 deletions
diff --git a/arch/arm/plat-s5p/pm.c b/arch/arm/plat-s5p/pm.c index d592b6304b48..d15dc47b0e3d 100644 --- a/arch/arm/plat-s5p/pm.c +++ b/arch/arm/plat-s5p/pm.c | |||
| @@ -19,17 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | #define PFX "s5p pm: " | 20 | #define PFX "s5p pm: " |
| 21 | 21 | ||
| 22 | /* s3c_pm_check_resume_pin | ||
| 23 | * | ||
| 24 | * check to see if the pin is configured correctly for sleep mode, and | ||
| 25 | * make any necessary adjustments if it is not | ||
| 26 | */ | ||
| 27 | |||
| 28 | static void s3c_pm_check_resume_pin(unsigned int pin, unsigned int irqoffs) | ||
| 29 | { | ||
| 30 | /* nothing here yet */ | ||
| 31 | } | ||
| 32 | |||
| 33 | /* s3c_pm_configure_extint | 22 | /* s3c_pm_configure_extint |
| 34 | * | 23 | * |
| 35 | * configure all external interrupt pins | 24 | * configure all external interrupt pins |
diff --git a/arch/arm/plat-samsung/pm-check.c b/arch/arm/plat-samsung/pm-check.c index e4baf76f374a..6b733fafe7cd 100644 --- a/arch/arm/plat-samsung/pm-check.c +++ b/arch/arm/plat-samsung/pm-check.c | |||
| @@ -164,7 +164,6 @@ static inline int in_region(void *ptr, int size, void *what, size_t whatsz) | |||
| 164 | */ | 164 | */ |
| 165 | static u32 *s3c_pm_runcheck(struct resource *res, u32 *val) | 165 | static u32 *s3c_pm_runcheck(struct resource *res, u32 *val) |
| 166 | { | 166 | { |
| 167 | void *save_at = phys_to_virt(s3c_sleep_save_phys); | ||
| 168 | unsigned long addr; | 167 | unsigned long addr; |
| 169 | unsigned long left; | 168 | unsigned long left; |
| 170 | void *stkpage; | 169 | void *stkpage; |
| @@ -192,11 +191,6 @@ static u32 *s3c_pm_runcheck(struct resource *res, u32 *val) | |||
| 192 | goto skip_check; | 191 | goto skip_check; |
| 193 | } | 192 | } |
| 194 | 193 | ||
| 195 | if (in_region(ptr, left, save_at, 32*4 )) { | ||
| 196 | S3C_PMDBG("skipping %08lx, has save block in\n", addr); | ||
| 197 | goto skip_check; | ||
| 198 | } | ||
| 199 | |||
| 200 | /* calculate and check the checksum */ | 194 | /* calculate and check the checksum */ |
| 201 | 195 | ||
| 202 | calc = crc32_le(~0, ptr, left); | 196 | calc = crc32_le(~0, ptr, left); |
diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c index d5b58d31903c..5c0a440d6e16 100644 --- a/arch/arm/plat-samsung/pm.c +++ b/arch/arm/plat-samsung/pm.c | |||
| @@ -214,8 +214,9 @@ void s3c_pm_do_restore_core(struct sleep_save *ptr, int count) | |||
| 214 | * | 214 | * |
| 215 | * print any IRQs asserted at resume time (ie, we woke from) | 215 | * print any IRQs asserted at resume time (ie, we woke from) |
| 216 | */ | 216 | */ |
| 217 | static void s3c_pm_show_resume_irqs(int start, unsigned long which, | 217 | static void __maybe_unused s3c_pm_show_resume_irqs(int start, |
| 218 | unsigned long mask) | 218 | unsigned long which, |
| 219 | unsigned long mask) | ||
| 219 | { | 220 | { |
| 220 | int i; | 221 | int i; |
| 221 | 222 | ||
