[tip:um/irq] um: Convert irq_chips to new functions

[tip-bot for Thomas Gleixner <tglx@linutronix.de>]

Commit-ID:  1d119aa06fb2b2608151a162f15c480d46694b65
Gitweb:     http://git.kernel.org/tip/1d119aa06fb2b2608151a162f15c480d46694b65
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Sun, 6 Feb 2011 22:45:34 +0000
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 14 Feb 2011 19:37:39 +0100

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>
---
 arch/um/kernel/irq.c |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index c916748..f771b85 100644
--- 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)