[POWERPC] arch/powerpc/sysdev/cpm2_pic.c of_node_get cleanup

[powerpc.git] / arch / powerpc / sysdev / ipic.c

diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index 0251b7c..522aa14 100644 (file)
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -1,5 +1,5 @@
 /*
- * include/asm-ppc/ipic.c
+ * arch/powerpc/sysdev/ipic.c
  *
  * IPIC routines implementations.
  *
@@ -473,9 +473,9 @@ static int ipic_set_irq_type(unsigned int virq, unsigned int flow_type)
        desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
        if (flow_type & IRQ_TYPE_LEVEL_LOW)  {
                desc->status |= IRQ_LEVEL;
-               set_irq_handler(virq, handle_level_irq);
+               desc->handle_irq = handle_level_irq;
        } else {
-               set_irq_handler(virq, handle_edge_irq);
+               desc->handle_irq = handle_edge_irq;
        }
 
        /* only EXT IRQ senses are programmable on ipic
@@ -569,7 +569,7 @@ void __init ipic_init(struct device_node *node,
                return;
 
        memset(ipic, 0, sizeof(struct ipic));
-       ipic->of_node = node ? of_node_get(node) : NULL;
+       ipic->of_node = of_node_get(node);
 
        ipic->irqhost = irq_alloc_host(IRQ_HOST_MAP_LINEAR,
                                       NR_IPIC_INTS,
@@ -709,7 +709,7 @@ void ipic_clear_mcp_status(u32 mask)
 }
 
 /* Return an interrupt vector or NO_IRQ if no interrupt is pending. */
-unsigned int ipic_get_irq(struct pt_regs *regs)
+unsigned int ipic_get_irq(void)
 {
        int irq;