um: Convert irq_chips to new functions

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <20110206224515.224027758@linutronix.de>

diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index c9167485431e12b929f69092648630ad79fe87fe..f771b85833e3820aba499da98eac890eb491b621 100644 (file)
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -360,10 +360,10 @@ EXPORT_SYMBOL(um_request_irq);
 EXPORT_SYMBOL(reactivate_fd);
 
 /*
- * irq_chip must define (startup || enable) &&
- * (shutdown || disable) && end
+ * irq_chip must define at least enable/disable and ack when
+ * the edge handler is used.
  */
-static void dummy(unsigned int irq)
+static void dummy(struct irq_data *d)
 {
 }
 
@@ -371,18 +371,17 @@ static void dummy(unsigned int irq)
 static struct irq_chip normal_irq_type = {
        .name = "SIGIO",
        .release = free_irq_by_irq_and_dev,
-       .disable = dummy,
-       .enable = dummy,
-       .ack = dummy,
+       .irq_disable = dummy,
+       .irq_enable = dummy,
+       .irq_ack = dummy,
 };
 
 static struct irq_chip SIGVTALRM_irq_type = {
        .name = "SIGVTALRM",
        .release = free_irq_by_irq_and_dev,
-       .shutdown = dummy, /* never called */
-       .disable = dummy,
-       .enable = dummy,
-       .ack = dummy,
+       .irq_disable = dummy,
+       .irq_enable = dummy,
+       .irq_ack = dummy,
 };
 
 void __init init_IRQ(void)