1 files changed, 9 insertions, 9 deletions

diff --git a/arch/sparc/kernel/prom_irqtrans.c b/arch/sparc/kernel/prom_irqtrans.c
index ce651147fabc..40e4936bd479 100644
--- a/arch/sparc/kernel/prom_irqtrans.c
+++ b/arch/sparc/kernel/prom_irqtrans.c
@@ -227,7 +227,7 @@ static unsigned int sabre_irq_build(struct device_node *dp,
         unsigned long imap, iclr;
         unsigned long imap_off, iclr_off;
         int inofixup = 0;
-        int virt_irq;
+        int irq;
 
         ino &= 0x3f;
         if (ino < SABRE_ONBOARD_IRQ_BASE) {
@@ -247,7 +247,7 @@ static unsigned int sabre_irq_build(struct device_node *dp,
         if ((ino & 0x20) == 0)
                 inofixup = ino & 0x03;
 
-        virt_irq = build_irq(inofixup, iclr, imap);
+        irq = build_irq(inofixup, iclr, imap);
 
         /* If the parent device is a PCI<->PCI bridge other than
          * APB, we have to install a pre-handler to ensure that
@@ -256,13 +256,13 @@ static unsigned int sabre_irq_build(struct device_node *dp,
          */
         regs = of_get_property(dp, "reg", NULL);
         if (regs && sabre_device_needs_wsync(dp)) {
-                irq_install_pre_handler(virt_irq,
+                irq_install_pre_handler(irq,
                                         sabre_wsync_handler,
                                         (void *) (long) regs->phys_hi,
                                         (void *) irq_data);
         }
 
-        return virt_irq;
+        return irq;
 }
 
 static void __init sabre_irq_trans_init(struct device_node *dp)
@@ -382,7 +382,7 @@ static unsigned int schizo_irq_build(struct device_node *dp,
         unsigned long pbm_regs = irq_data->pbm_regs;
         unsigned long imap, iclr;
         int ign_fixup;
-        int virt_irq;
+        int irq;
         int is_tomatillo;
 
         ino &= 0x3f;
@@ -409,17 +409,17 @@ static unsigned int schizo_irq_build(struct device_node *dp,
                         ign_fixup = (1 << 6);
         }
 
-        virt_irq = build_irq(ign_fixup, iclr, imap);
+        irq = build_irq(ign_fixup, iclr, imap);
 
         if (is_tomatillo) {
-                irq_install_pre_handler(virt_irq,
+                irq_install_pre_handler(irq,
                                         tomatillo_wsync_handler,
                                         ((irq_data->chip_version <= 4) ?
                                          (void *) 1 : (void *) 0),
                                         (void *) irq_data->sync_reg);
         }
 
-        return virt_irq;
+        return irq;
 }
 
 static void __init __schizo_irq_trans_init(struct device_node *dp,
@@ -694,7 +694,7 @@ static unsigned int sbus_of_build_irq(struct device_node *dp,
                 case 3:
                         iclr = reg_base + SYSIO_ICLR_SLOT3;
                         break;
-                };
+                }
 
                 iclr += ((unsigned long)sbus_level - 1UL) * 8UL;
         }