Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f9605c2 authored by Russell King's avatar Russell King Committed by Tony Lindgren
Browse files

omap2+: Fix unused variable warning for omap_irq_base 



Commit 5d190c40
(omap2+: Initialize omap_irq_base for entry-macro.S from
platform code) simplified the handling of omap_irq_base
for multi-omap builds. However, this patch also introduced
a build warning for !MULTI_OMAP2 builds:

arch/arm/mach-omap2/io.c: In function 'omap_irq_base_init':
arch/arm/mach-omap2/io.c:322: warning: unused variable 'omap_irq_base'

Fix this by removing the ifdef. Also simplify things further
by moving omap_irq_base out of entry-macro.S.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
[tony@atomide.com: updated comments]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 6fb1b304

arch/arm/mach-omap2/include/mach/entry-macro.S

+0 −14
Original line number Diff line number Diff line
@@ -38,20 +38,6 @@ 
 */



#ifdef MULTI_OMAP2



/*

 * We use __glue to avoid errors with multiple definitions of

 * .globl omap_irq_base as it's included from entry-armv.S but not

 * from entry-common.S.

 */

#ifdef __glue

		.pushsection .data

		.globl	omap_irq_base

omap_irq_base:

		.word	0

		.popsection

#endif



		/*

		 * Configure the interrupt base on the first interrupt.

		 * See also omap_irq_base_init for setting omap_irq_base.

arch/arm/mach-omap2/io.c

+2 −4
Original line number Diff line number Diff line
@@ -314,14 +314,13 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) 
	return omap_hwmod_set_postsetup_state(oh, *(u8 *)data);

}



void __iomem *omap_irq_base;



/*

 * Initialize asm_irq_base for entry-macro.S

 */

static inline void omap_irq_base_init(void)

{

	extern void __iomem *omap_irq_base;



#ifdef MULTI_OMAP2

	if (cpu_is_omap24xx())

		omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE);

	else if (cpu_is_omap34xx())
@@ -330,7 +329,6 @@ static inline void omap_irq_base_init(void) 
		omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE);

	else

		pr_err("Could not initialize omap_irq_base\n");

#endif

}



void __init omap2_init_common_infrastructure(void)