diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-17 17:36:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-17 17:36:45 -0700 |
| commit | 59c87de883d30289b82fa3f78e95a0d641f99fc4 (patch) | |
| tree | 6e5c314da1019f471754cceb8e2b5de7ac4e1db6 /arch/arm/plat-samsung/pm-check.c | |
| parent | a78eda5cd3055852231ad10cfd047e65cb44dfde (diff) | |
| parent | baab7307c7af963fbd993149d50dd45232b9d04c (diff) | |
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Fix warning 's3c_pm_show_resume_irqs' defined but not used
ARM: SAMSUNG: Fix build failure in PM CRC check code
ARM: S5P: Remove unused s3c_pm_check_resume_pin
Diffstat (limited to 'arch/arm/plat-samsung/pm-check.c')
| -rw-r--r-- | arch/arm/plat-samsung/pm-check.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/plat-samsung/pm-check.c b/arch/arm/plat-samsung/pm-check.c index e4baf76f374..6b733fafe7c 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) */ static u32 *s3c_pm_runcheck(struct resource *res, u32 *val) { - void *save_at = phys_to_virt(s3c_sleep_save_phys); unsigned long addr; unsigned long left; void *stkpage; @@ -192,11 +191,6 @@ static u32 *s3c_pm_runcheck(struct resource *res, u32 *val) goto skip_check; } - if (in_region(ptr, left, save_at, 32*4 )) { - S3C_PMDBG("skipping %08lx, has save block in\n", addr); - goto skip_check; - } - /* calculate and check the checksum */ calc = crc32_le(~0, ptr, left); |