leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2011-04-17 17:36:45 -07:00
commit 59c87de883
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/plat-s5p/pm.c
View File

@ -19,17 +19,6 @@
#define PFX "s5p pm: " #define PFX "s5p pm: "
/* s3c_pm_check_resume_pin
*
* check to see if the pin is configured correctly for sleep mode, and
* make any necessary adjustments if it is not
*/
static void s3c_pm_check_resume_pin(unsigned int pin, unsigned int irqoffs)
{
/* nothing here yet */
}
/* s3c_pm_configure_extint /* s3c_pm_configure_extint
* *
* configure all external interrupt pins * configure all external interrupt pins

6
arch/arm/plat-samsung/pm-check.c
View File

@ -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) 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 addr;
unsigned long left; unsigned long left;
void *stkpage; void *stkpage;
@ -192,11 +191,6 @@ static u32 *s3c_pm_runcheck(struct resource *res, u32 *val)
goto skip_check; 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 */ /* calculate and check the checksum */
calc = crc32_le(~0, ptr, left); calc = crc32_le(~0, ptr, left);

5
arch/arm/plat-samsung/pm.c
View File

@ -214,8 +214,9 @@ void s3c_pm_do_restore_core(struct sleep_save *ptr, int count)
* *
* print any IRQs asserted at resume time (ie, we woke from) * print any IRQs asserted at resume time (ie, we woke from)
*/ */
static void s3c_pm_show_resume_irqs(int start, unsigned long which, static void __maybe_unused s3c_pm_show_resume_irqs(int start,
unsigned long mask) unsigned long which,
unsigned long mask)
{ {
int i; int i;