blackfin: remove redundant CONFIG_BF60x macro (36413022) · Commits · e / devices / android_kernel_sony_msm8998

arch/blackfin/mach-common/dpmc_modes.S

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,6 @@
	#include <asm/dpmc.h>		#include <asm/dpmc.h>

	.section .l1.text		.section .l1.text
	#ifndef CONFIG_BF60x
	ENTRY(_sleep_mode)		ENTRY(_sleep_mode)
	[--SP] = (R7:4, P5:3);		[--SP] = (R7:4, P5:3);
	[--SP] = RETS;		[--SP] = RETS;
	@@ -49,7 +48,6 @@ ENTRY(_sleep_mode)
	(R7:4, P5:3) = [SP++];		(R7:4, P5:3) = [SP++];
	RTS;		RTS;
	ENDPROC(_sleep_mode)		ENDPROC(_sleep_mode)
	#endif

	/*		/*
	* This func never returns as it puts the part into hibernate, and		* This func never returns as it puts the part into hibernate, and
	@@ -64,7 +62,6 @@ ENTRY(_hibernate_mode)
	/* Save/setup the regs we need early for minor pipeline optimization */		/* Save/setup the regs we need early for minor pipeline optimization */
	R4 = R0;		R4 = R0;

	#ifndef CONFIG_BF60x
	P3.H = hi(VR_CTL);		P3.H = hi(VR_CTL);
	P3.L = lo(VR_CTL);		P3.L = lo(VR_CTL);
	/* Disable all wakeup sources */		/* Disable all wakeup sources */
	@@ -74,7 +71,6 @@ ENTRY(_hibernate_mode)
	call _set_sic_iwr;		call _set_sic_iwr;
	call _set_dram_srfs;		call _set_dram_srfs;
	SSYNC;		SSYNC;
	#endif

	/* Finally, we climb into our cave to hibernate */		/* Finally, we climb into our cave to hibernate */
	W[P3] = R4.L;		W[P3] = R4.L;
	@@ -84,7 +80,6 @@ ENTRY(_hibernate_mode)
	jump .Lforever;		jump .Lforever;
	ENDPROC(_hibernate_mode)		ENDPROC(_hibernate_mode)

	#ifndef CONFIG_BF60x
	ENTRY(_sleep_deeper)		ENTRY(_sleep_deeper)
	[--SP] = (R7:4, P5:3);		[--SP] = (R7:4, P5:3);
	[--SP] = RETS;		[--SP] = RETS;
	@@ -279,7 +274,6 @@ ENTRY(_test_pll_locked)
	IF !CC JUMP 1b;		IF !CC JUMP 1b;
	RTS;		RTS;
	ENDPROC(_test_pll_locked)		ENDPROC(_test_pll_locked)
	#endif

	.section .text		.section .text
	ENTRY(_do_hibernate)		ENTRY(_do_hibernate)