tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

authored by

Russell King and committed by
Russell King 6597cb84 878708f2

+16 -16
+2 -4
arch/arm/mach-omap2/gpmc.c
··· 429 429 gpmc_l3_clk = clk_get(NULL, ck); 430 430 if (IS_ERR(gpmc_l3_clk)) { 431 431 printk(KERN_ERR "Could not get GPMC clock %s\n", ck); 432 - return -ENODEV; 432 + BUG(); 433 433 } 434 434 435 435 gpmc_base = ioremap(l, SZ_4K); 436 436 if (!gpmc_base) { 437 437 clk_put(gpmc_l3_clk); 438 438 printk(KERN_ERR "Could not get GPMC register memory\n"); 439 - return -ENOMEM; 439 + BUG(); 440 440 } 441 - 442 - BUG_ON(IS_ERR(gpmc_l3_clk)); 443 441 444 442 l = gpmc_read_reg(GPMC_REVISION); 445 443 printk(KERN_INFO "GPMC revision %d.%d\n", (l >> 4) & 0x0f, l & 0x0f);
+10 -10
arch/arm/plat-omap/clock.c
··· 428 428 if (c->id != 0) 429 429 sprintf(p, ":%d", c->id); 430 430 d = debugfs_create_dir(s, pa ? pa->dent : clk_debugfs_root); 431 - if (IS_ERR(d)) 432 - return PTR_ERR(d); 431 + if (!d) 432 + return -ENOMEM; 433 433 c->dent = d; 434 434 435 435 d = debugfs_create_u8("usecount", S_IRUGO, c->dent, (u8 *)&c->usecount); 436 - if (IS_ERR(d)) { 437 - err = PTR_ERR(d); 436 + if (!d) { 437 + err = -ENOMEM; 438 438 goto err_out; 439 439 } 440 440 d = debugfs_create_u32("rate", S_IRUGO, c->dent, (u32 *)&c->rate); 441 - if (IS_ERR(d)) { 442 - err = PTR_ERR(d); 441 + if (!d) { 442 + err = -ENOMEM; 443 443 goto err_out; 444 444 } 445 445 d = debugfs_create_x32("flags", S_IRUGO, c->dent, (u32 *)&c->flags); 446 - if (IS_ERR(d)) { 447 - err = PTR_ERR(d); 446 + if (!d) { 447 + err = -ENOMEM; 448 448 goto err_out; 449 449 } 450 450 return 0; ··· 483 483 int err; 484 484 485 485 d = debugfs_create_dir("clock", NULL); 486 - if (IS_ERR(d)) 487 - return PTR_ERR(d); 486 + if (!d) 487 + return -ENOMEM; 488 488 clk_debugfs_root = d; 489 489 490 490 list_for_each_entry(c, &clocks, node) {
+3 -1
arch/arm/plat-omap/include/mach/entry-macro.S
··· 65 65 #include <mach/omap34xx.h> 66 66 #endif 67 67 68 - #define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt number */ 68 + #define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt offset */ 69 + #define ACTIVEIRQ_MASK 0x7f /* Active interrupt bits */ 69 70 70 71 .macro disable_fiq 71 72 .endm ··· 89 88 cmp \irqnr, #0x0 90 89 2222: 91 90 ldrne \irqnr, [\base, #INTCPS_SIR_IRQ_OFFSET] 91 + and \irqnr, \irqnr, #ACTIVEIRQ_MASK /* Clear spurious bits */ 92 92 93 93 .endm 94 94
+1 -1
arch/arm/plat-omap/include/mach/irqs.h
··· 372 372 373 373 /* External TWL4030 gpio interrupts are optional */ 374 374 #define TWL4030_GPIO_IRQ_BASE TWL4030_PWR_IRQ_END 375 - #ifdef CONFIG_TWL4030_GPIO 375 + #ifdef CONFIG_GPIO_TWL4030 376 376 #define TWL4030_GPIO_NR_IRQS 18 377 377 #else 378 378 #define TWL4030_GPIO_NR_IRQS 0