Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

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

diff --git a/arch/sh/boards/mach-systemh/irq.c b/arch/sh/boards/mach-systemh/irq.c
index 523aea5..e5ee13a 100644 (file)
--- a/arch/sh/boards/mach-systemh/irq.c
+++ b/arch/sh/boards/mach-systemh/irq.c
@@ -23,54 +23,39 @@
 static unsigned long *systemh_irq_mask_register = (unsigned long *)0xB3F10004;
 static unsigned long *systemh_irq_request_register = (unsigned long *)0xB3F10000;
 
-/* forward declaration */
-static void enable_systemh_irq(unsigned int irq);
-static void disable_systemh_irq(unsigned int irq);
-static void mask_and_ack_systemh(unsigned int);
-
-static struct irq_chip systemh_irq_type = {
-       .name = " SystemH Register",
-       .unmask = enable_systemh_irq,
-       .mask = disable_systemh_irq,
-       .ack = mask_and_ack_systemh,
-};
-
-static void disable_systemh_irq(unsigned int irq)
+static void disable_systemh_irq(struct irq_data *data)
 {
-       if (systemh_irq_mask_register) {
-               unsigned long val, mask = 0x01 << 1;
+       unsigned long val, mask = 0x01 << 1;
 
-               /* Clear the "irq"th bit in the mask and set it in the request */
-               val = __raw_readl((unsigned long)systemh_irq_mask_register);
-               val &= ~mask;
-               __raw_writel(val, (unsigned long)systemh_irq_mask_register);
+       /* Clear the "irq"th bit in the mask and set it in the request */
+       val = __raw_readl((unsigned long)systemh_irq_mask_register);
+       val &= ~mask;
+       __raw_writel(val, (unsigned long)systemh_irq_mask_register);
 
-               val = __raw_readl((unsigned long)systemh_irq_request_register);
-               val |= mask;
-               __raw_writel(val, (unsigned long)systemh_irq_request_register);
-       }
+       val = __raw_readl((unsigned long)systemh_irq_request_register);
+       val |= mask;
+       __raw_writel(val, (unsigned long)systemh_irq_request_register);
 }
 
-static void enable_systemh_irq(unsigned int irq)
+static void enable_systemh_irq(struct irq_data *data)
 {
-       if (systemh_irq_mask_register) {
-               unsigned long val, mask = 0x01 << 1;
+       unsigned long val, mask = 0x01 << 1;
 
-               /* Set "irq"th bit in the mask register */
-               val = __raw_readl((unsigned long)systemh_irq_mask_register);
-               val |= mask;
-               __raw_writel(val, (unsigned long)systemh_irq_mask_register);
-       }
+       /* Set "irq"th bit in the mask register */
+       val = __raw_readl((unsigned long)systemh_irq_mask_register);
+       val |= mask;
+       __raw_writel(val, (unsigned long)systemh_irq_mask_register);
 }
 
-static void mask_and_ack_systemh(unsigned int irq)
-{
-       disable_systemh_irq(irq);
-}
+static struct irq_chip systemh_irq_type = {
+       .name           = "SystemH Register",
+       .irq_unmask     = enable_systemh_irq,
+       .irq_mask       = disable_systemh_irq,
+};
 
 void make_systemh_irq(unsigned int irq)
 {
        disable_irq_nosync(irq);
        set_irq_chip_and_handler(irq, &systemh_irq_type, handle_level_irq);
-       disable_systemh_irq(irq);
+       disable_systemh_irq(irq_get_irq_data(irq));
 }