Subject: spider pic cleanup From: Jens Osterkamp This patch is a small cleanup of the spiderpic code. Signed-off-by: Murali Iyer Signed-off-by: Arnd Bergmann Index: linux-2.6.16-rc1/arch/powerpc/platforms/cell/spider-pic.c =================================================================== --- linux-2.6.16-rc1.orig/arch/powerpc/platforms/cell/spider-pic.c +++ linux-2.6.16-rc1/arch/powerpc/platforms/cell/spider-pic.c @@ -154,8 +154,6 @@ void spider_init_IRQ_hardcoded(void) long pics[] = { 0x24000008000, 0x34000008000 }; int n; - pr_debug("%s(%d): Using hardcoded defaults\n", __FUNCTION__, __LINE__); - for (node = 0; node < num_present_cpus()/2; node++) { spiderpic = pics[node]; printk(KERN_DEBUG "SPIDER addr: %lx\n", spiderpic); @@ -165,25 +163,25 @@ void spider_init_IRQ_hardcoded(void) get_irq_desc(irq)->handler = &spider_pic; } - /* do not mask any interrupts because of level */ - out_be32(spider_pics[node] + TIR_MSK, 0x0); + /* do not mask any interrupts because of level */ + out_be32(spider_pics[node] + TIR_MSK, 0x0); - /* disable edge detection clear */ - /* out_be32(spider_pics[node] + TIR_EDC, 0x0); */ + /* disable edge detection clear */ + /* out_be32(spider_pics[node] + TIR_EDC, 0x0); */ - /* enable interrupt packets to be output */ - out_be32(spider_pics[node] + TIR_PIEN, + /* enable interrupt packets to be output */ + out_be32(spider_pics[node] + TIR_PIEN, in_be32(spider_pics[node] + TIR_PIEN) | 0x1); - /* Enable the interrupt detection enable bit. Do this last! */ - out_be32(spider_pics[node] + TIR_DEN, + /* Enable the interrupt detection enable bit. Do this last! */ + out_be32(spider_pics[node] + TIR_DEN, in_be32(spider_pics[node] + TIR_DEN) | 0x1); } } void spider_init_IRQ(void) { - long spider_reg; + long *spider_reg; struct device_node *dn; char *compatible; int n, node = 0;