-13

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

reviewed

··· 14 14 #include <mach/irqs.h> 15 15 #include <asm/hardware/gic.h> 16 16 17 17 - /* 18 18 - * We use __glue to avoid errors with multiple definitions of 19 19 - * .globl omap_irq_flags as it's included from entry-armv.S but not 20 20 - * from entry-common.S. 21 21 - */ 22 22 - #ifdef __glue 23 23 - .pushsection .data 24 24 - .globl omap_irq_flags 25 25 - omap_irq_flags: 26 26 - .word 0 27 27 - .popsection 28 28 - #endif 29 29 - 30 17 .macro disable_fiq 31 18 .endm 32 19

+1 -1

arch/arm/mach-omap1/irq.c

reviewed

··· 57 57 unsigned long wake_enable; 58 58 }; 59 59 60 60 + u32 omap_irq_flags; 60 61 static unsigned int irq_bank_count; 61 62 static struct omap_irq_bank *irq_banks; 62 63 ··· 177 176 178 177 void __init omap_init_irq(void) 179 178 { 180 180 - extern unsigned int omap_irq_flags; 181 179 int i, j; 182 180 183 181 #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

+1 -1

arch/arm/mach-omap2/dma.c

reviewed

··· 264 264 if (IS_ERR(od)) { 265 265 pr_err("%s: Cant build omap_device for %s:%s.\n", 266 266 __func__, name, oh->name); 267 267 - return IS_ERR(od); 267 267 + return PTR_ERR(od); 268 268 } 269 269 270 270 mem = platform_get_resource(&od->pdev, IORESOURCE_MEM, 0);

-14

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

reviewed

··· 38 38 */ 39 39 40 40 #ifdef MULTI_OMAP2 41 41 - 42 42 - /* 43 43 - * We use __glue to avoid errors with multiple definitions of 44 44 - * .globl omap_irq_base as it's included from entry-armv.S but not 45 45 - * from entry-common.S. 46 46 - */ 47 47 - #ifdef __glue 48 48 - .pushsection .data 49 49 - .globl omap_irq_base 50 50 - omap_irq_base: 51 51 - .word 0 52 52 - .popsection 53 53 - #endif 54 54 - 55 41 /* 56 42 * Configure the interrupt base on the first interrupt. 57 43 * See also omap_irq_base_init for setting omap_irq_base.

+2 -4

arch/arm/mach-omap2/io.c

reviewed

··· 314 314 return omap_hwmod_set_postsetup_state(oh, *(u8 *)data); 315 315 } 316 316 317 317 + void __iomem *omap_irq_base; 318 318 + 317 319 /* 318 320 * Initialize asm_irq_base for entry-macro.S 319 321 */ 320 322 static inline void omap_irq_base_init(void) 321 323 { 322 322 - extern void __iomem *omap_irq_base; 323 323 - 324 324 - #ifdef MULTI_OMAP2 325 324 if (cpu_is_omap24xx()) 326 325 omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE); 327 326 else if (cpu_is_omap34xx()) ··· 329 330 omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE); 330 331 else 331 332 pr_err("Could not initialize omap_irq_base\n"); 332 332 - #endif 333 333 } 334 334 335 335 void __init omap2_init_common_infrastructure(void)

+1 -1

arch/arm/mach-omap2/mux.c

reviewed

··· 160 160 struct omap_mux *mux = NULL; 161 161 struct omap_mux_entry *e; 162 162 const char *mode_name; 163 163 - int found = 0, found_mode, mode0_len = 0; 163 163 + int found = 0, found_mode = 0, mode0_len = 0; 164 164 struct list_head *muxmodes = &partition->muxmodes; 165 165 166 166 mode_name = strchr(muxname, '.');