Merge branch 's5p-fixes-for-linus' of... (59c87de8) · Commits · 戴 / test

arch/arm/plat-s5p/pm.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -19,17 +19,6 @@

		#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
		*
		* configure all external interrupt pins

+0 −6

Original line number	Diff line number	Diff line
		@@ -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);

+3 −2

Original line number	Diff line number	Diff line
		@@ -214,7 +214,8 @@ void s3c_pm_do_restore_core(struct sleep_save *ptr, int count)
		*
		* 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 which,
		unsigned long mask)
		{
		int i;