Merge branches 'sh/serial-rework' and 'sh/oprofile'

[pandora-kernel.git] / arch / alpha / kernel / sys_sable.c

diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c
index 906019c..a4555f4 100644 (file)
--- a/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
@@ -47,7 +47,7 @@ typedef struct irq_swizzle_struct
 
 static irq_swizzle_t *sable_lynx_irq_swizzle;
 
-static void sable_lynx_init_irq(int nr_irqs);
+static void sable_lynx_init_irq(int nr_of_irqs);
 
 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_SABLE)
 
@@ -454,7 +454,7 @@ sable_lynx_enable_irq(unsigned int irq)
        spin_unlock(&sable_lynx_irq_lock);
 #if 0
        printk("%s: mask 0x%lx bit 0x%x irq 0x%x\n",
-              __FUNCTION__, mask, bit, irq);
+              __func__, mask, bit, irq);
 #endif
 }
 
@@ -470,7 +470,7 @@ sable_lynx_disable_irq(unsigned int irq)
        spin_unlock(&sable_lynx_irq_lock);
 #if 0
        printk("%s: mask 0x%lx bit 0x%x irq 0x%x\n",
-              __FUNCTION__, mask, bit, irq);
+              __func__, mask, bit, irq);
 #endif
 }
 
@@ -524,17 +524,17 @@ sable_lynx_srm_device_interrupt(unsigned long vector)
        irq = sable_lynx_irq_swizzle->mask_to_irq[bit];
 #if 0
        printk("%s: vector 0x%lx bit 0x%x irq 0x%x\n",
-              __FUNCTION__, vector, bit, irq);
+              __func__, vector, bit, irq);
 #endif
        handle_irq(irq);
 }
 
 static void __init
-sable_lynx_init_irq(int nr_irqs)
+sable_lynx_init_irq(int nr_of_irqs)
 {
        long i;
 
-       for (i = 0; i < nr_irqs; ++i) {
+       for (i = 0; i < nr_of_irqs; ++i) {
                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
                irq_desc[i].chip = &sable_lynx_irq_type;
        }