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

Commit 35a8524f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-fixes-for-linus' of... 

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR
  arm: omap2: mux: fix compile warning
  omap1: Simplify use of omap_irq_flags
  omap2+: Fix unused variable warning for omap_irq_base
parents ffbbf2da 0e6d8cad

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

+0 −13
Original line number Diff line number Diff line
@@ -14,19 +14,6 @@ 
#include <mach/irqs.h>

#include <asm/hardware/gic.h>



/*

 * We use __glue to avoid errors with multiple definitions of

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

 * from entry-common.S.

 */

#ifdef __glue

		.pushsection .data

		.globl	omap_irq_flags

omap_irq_flags:

		.word	0

		.popsection

#endif



 		.macro	disable_fiq

		.endm

arch/arm/mach-omap1/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct omap_irq_bank { 
	unsigned long wake_enable;

};



u32 omap_irq_flags;

static unsigned int irq_bank_count;

static struct omap_irq_bank *irq_banks;
@@ -176,7 +177,6 @@ static struct irq_chip omap_irq_chip = { 


void __init omap_init_irq(void)

{

	extern unsigned int omap_irq_flags;

	int i, j;



#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

arch/arm/mach-omap2/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) 
	if (IS_ERR(od)) {

		pr_err("%s: Cant build omap_device for %s:%s.\n",

			__func__, name, oh->name);

		return IS_ERR(od);

		return PTR_ERR(od);

	}



	mem = platform_get_resource(&od->pdev, IORESOURCE_MEM, 0);

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)