From 454960f5d37d15c745ac60ffaf0a9a485c1a3b83 Mon Sep 17 00:00:00 2001
From: Richard Weinberger <richard@nod.at>
Date: Tue, 17 Apr 2012 22:37:16 +0200
Subject: [PATCH] --- yaml --- r: 305314 b: refs/heads/master c:
 875682648b89a3ebc06176d60dc280f810647839 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/irq.h | 5 -----
 trunk/kernel/irq/manage.c | 6 ------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index f77044797c92..6968b94c297c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 985a94a96d294fe6d2c72d013de09b81b637ed58
+refs/heads/master: 875682648b89a3ebc06176d60dc280f810647839
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
index b27cfcfd3a59..61f5cec031e0 100644
--- a/trunk/include/linux/irq.h
+++ b/trunk/include/linux/irq.h
@@ -335,11 +335,6 @@ struct irq_chip {
 	void		(*irq_print_chip)(struct irq_data *data, struct seq_file *p);
 
 	unsigned long	flags;
-
-	/* Currently used only by UML, might disappear one day.*/
-#ifdef CONFIG_IRQ_RELEASE_METHOD
-	void		(*release)(unsigned int irq, void *dev_id);
-#endif
 };
 
 /*
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 89a3ea82569b..9b7f68a00e5e 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -1204,12 +1204,6 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
 	/* Found it - now remove it from the list of entries: */
 	*action_ptr = action->next;
 
-	/* Currently used only by UML, might disappear one day: */
-#ifdef CONFIG_IRQ_RELEASE_METHOD
-	if (desc->irq_data.chip->release)
-		desc->irq_data.chip->release(irq, dev_id);
-#endif
-
 	/* If this was the last handler, shut down the IRQ line: */
 	if (!desc->action)
 		irq_shutdown(desc);