Commit ae1242a5 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: PowerTV: Fix build. 



  CC      arch/mips/powertv/init.o
/home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c: In function ‘mips_nmi_setup’:
/home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c:80:8: error: variable ‘base’ set but not used [-Werror=unused-but-set-variable]
/home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c: In function ‘mips_ejtag_setup’:
/home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c:94:8: error: variable ‘base’ set but not used [-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors

As these two functions are, they don't serve any useful purpose so I've
deleted them entirely.

This warning exists in gcc 4.6.0 and newer.  Kernels 2.6.40 and newer use
-Wunused-but-set-variable to suppress it.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 686957e7

arch/mips/powertv/init.c

+0 −37
Original line number Diff line number Diff line
@@ -69,40 +69,6 @@ char *prom_getenv(char *envname) 
	return result;

}



/* TODO: Verify on linux-mips mailing list that the following two  */

/* functions are correct                                           */

/* TODO: Copy NMI and EJTAG exception vectors to memory from the   */

/* BootROM exception vectors. Flush their cache entries. test it.  */



static void __init mips_nmi_setup(void)

{

	void *base;

#if defined(CONFIG_CPU_MIPS32_R1)

	base = cpu_has_veic ?

		(void *)(CAC_BASE + 0xa80) :

		(void *)(CAC_BASE + 0x380);

#elif defined(CONFIG_CPU_MIPS32_R2)

	base = (void *)0xbfc00000;

#else

#error NMI exception handler address not defined

#endif

}



static void __init mips_ejtag_setup(void)

{

	void *base;



#if defined(CONFIG_CPU_MIPS32_R1)

	base = cpu_has_veic ?

		(void *)(CAC_BASE + 0xa00) :

		(void *)(CAC_BASE + 0x300);

#elif defined(CONFIG_CPU_MIPS32_R2)

	base = (void *)0xbfc00480;

#else

#error EJTAG exception handler address not defined

#endif

}



void __init prom_init(void)

{

	int prom_argc;
@@ -113,9 +79,6 @@ void __init prom_init(void) 
	_prom_envp = (int *) fw_arg2;

	_prom_memsize = (unsigned long) fw_arg3;



	board_nmi_handler_setup = mips_nmi_setup;

	board_ejtag_handler_setup = mips_ejtag_setup;



	if (prom_argc == 1) {

		strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE);

		strlcat(arcs_cmdline, prom_argv, COMMAND_LINE_SIZE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE