Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 into test

[pandora-kernel.git] / arch / sh / boards / mach-landisk / irq.c

diff --git a/arch/sh/boards/mach-landisk/irq.c b/arch/sh/boards/mach-landisk/irq.c
index 96f38a4..e79412a 100644 (file)
--- a/arch/sh/boards/mach-landisk/irq.c
+++ b/arch/sh/boards/mach-landisk/irq.c
@@ -18,25 +18,24 @@
 #include <linux/io.h>
 #include <mach-landisk/mach/iodata_landisk.h>
 
-static void disable_landisk_irq(unsigned int irq)
+static void disable_landisk_irq(struct irq_data *data)
 {
-       unsigned char mask = 0xff ^ (0x01 << (irq - 5));
+       unsigned char mask = 0xff ^ (0x01 << (data->irq - 5));
 
        __raw_writeb(__raw_readb(PA_IMASK) & mask, PA_IMASK);
 }
 
-static void enable_landisk_irq(unsigned int irq)
+static void enable_landisk_irq(struct irq_data *data)
 {
-       unsigned char value = (0x01 << (irq - 5));
+       unsigned char value = (0x01 << (data->irq - 5));
 
        __raw_writeb(__raw_readb(PA_IMASK) | value, PA_IMASK);
 }
 
 static struct irq_chip landisk_irq_chip __read_mostly = {
        .name           = "LANDISK",
-       .mask           = disable_landisk_irq,
-       .unmask         = enable_landisk_irq,
-       .mask_ack       = disable_landisk_irq,
+       .irq_mask       = disable_landisk_irq,
+       .irq_unmask     = enable_landisk_irq,
 };
 
 /*
@@ -50,7 +49,7 @@ void __init init_landisk_IRQ(void)
                disable_irq_nosync(i);
                set_irq_chip_and_handler_name(i, &landisk_irq_chip,
                                              handle_level_irq, "level");
-               enable_landisk_irq(i);
+               enable_landisk_irq(irq_get_irq_data(i));
        }
        __raw_writeb(0x00, PA_PWRINT_CLR);
 }