1 files changed, 12 insertions, 13 deletions

diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index d7bbb61109f9..6b57a47c5d37 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -89,17 +89,17 @@ static struct irq_chip iic_chip = {
 /* Get an IRQ number from the pending state register of the IIC */
 static unsigned int iic_get_irq(struct pt_regs *regs)
 {
-        struct cbe_iic_pending_bits pending;
-        struct iic *iic;
-
-        iic = &__get_cpu_var(iic);
-        *(unsigned long *) &pending =
-                in_be64((unsigned long __iomem *) &iic->regs->pending_destr);
-        iic->eoi_stack[++iic->eoi_ptr] = pending.prio;
-        BUG_ON(iic->eoi_ptr > 15);
+        struct cbe_iic_pending_bits pending;
+        struct iic *iic;
+
+        iic = &__get_cpu_var(iic);
+        *(unsigned long *) &pending =
+                in_be64((unsigned long __iomem *) &iic->regs->pending_destr);
+        iic->eoi_stack[++iic->eoi_ptr] = pending.prio;
+        BUG_ON(iic->eoi_ptr > 15);
         if (pending.flags & CBE_IIC_IRQ_VALID)
                 return irq_linear_revmap(iic->host,
-                                         iic_pending_to_hwnum(pending));
+                                         iic_pending_to_hwnum(pending));
         return NO_IRQ;
 }
 
@@ -250,16 +250,15 @@ static int __init setup_iic(void)
         struct resource r0, r1;
         struct irq_host *host;
         int found = 0;
-        u32 *np;
+        const u32 *np;
 
         for (dn = NULL;
              (dn = of_find_node_by_name(dn,"interrupt-controller")) != NULL;) {
                 if (!device_is_compatible(dn,
                                      "IBM,CBEA-Internal-Interrupt-Controller"))
                         continue;
-                np = (u32 *)get_property(dn, "ibm,interrupt-server-ranges",
-                                         NULL);
-                if (np == NULL) {
+                np = get_property(dn, "ibm,interrupt-server-ranges", NULL);
+                if (np == NULL) {
                         printk(KERN_WARNING "IIC: CPU association not found\n");
                         of_node_put(dn);
                         return -ENODEV;