Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6-omap-h63xx.git] / arch / alpha / kernel / sys_sable.c

diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c
index a7a14647b50e01cf2f7725192b76e0d5c7b270a3..99a7f19da13aae935ae8b25ca9a590e8d5e02272 100644 (file)
--- a/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
@@ -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
 }
 
@@ -512,7 +512,7 @@ static struct hw_interrupt_type sable_lynx_irq_type = {
 };
 
 static void 
-sable_lynx_srm_device_interrupt(unsigned long vector, struct pt_regs * regs)
+sable_lynx_srm_device_interrupt(unsigned long vector)
 {
        /* Note that the vector reported by the SRM PALcode corresponds
           to the interrupt mask bits, but we have to manage via the
@@ -524,9 +524,9 @@ sable_lynx_srm_device_interrupt(unsigned long vector, struct pt_regs * regs)
        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, regs);
+       handle_irq(irq);
 }
 
 static void __init