Merge branch 'sh/dynamic-irq-cleanup' into sh-latest

Conflicts:
	drivers/sh/intc/dynamic.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

3 files changed, 4 insertions, 59 deletions

diff --git a/drivers/sh/intc/Makefile b/drivers/sh/intc/Makefile
index bb5df868d77a..44f006d09471 100644
--- a/drivers/sh/intc/Makefile
+++ b/drivers/sh/intc/Makefile
@@ -1,4 +1,4 @@
-obj-y   := access.o chip.o core.o dynamic.o handle.o virq.o
+obj-y   := access.o chip.o core.o handle.o virq.o
 
 obj-$(CONFIG_INTC_BALANCING)            += balancing.o
 obj-$(CONFIG_INTC_USERIMASK)            += userimask.o
diff --git a/drivers/sh/intc/dynamic.c b/drivers/sh/intc/dynamic.c
deleted file mode 100644
index 14eb01ef5d72..000000000000
--- a/drivers/sh/intc/dynamic.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Dynamic IRQ management
- *
- * Copyright (C) 2010  Paul Mundt
- *
- * Modelled after arch/x86/kernel/apic/io_apic.c
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#define pr_fmt(fmt) "intc: " fmt
-
-#include <linux/irq.h>
-#include <linux/bitmap.h>
-#include <linux/spinlock.h>
-#include <linux/module.h>
-#include "internals.h" /* only for activate_irq() damage.. */
-
-/*
- * The IRQ bitmap provides a global map of bound IRQ vectors for a
- * given platform. Allocation of IRQs are either static through the CPU
- * vector map, or dynamic in the case of board mux vectors or MSI.
- *
- * As this is a central point for all IRQ controllers on the system,
- * each of the available sources are mapped out here. This combined with
- * sparseirq makes it quite trivial to keep the vector map tightly packed
- * when dynamically creating IRQs, as well as tying in to otherwise
- * unused irq_desc positions in the sparse array.
- */
-
-/*
- * Dynamic IRQ allocation and deallocation
- */
-unsigned int create_irq_nr(unsigned int irq_want, int node)
-{
-        int irq = irq_alloc_desc_at(irq_want, node);
-        if (irq < 0)
-                return 0;
-
-        activate_irq(irq);
-        return irq;
-}
-
-int create_irq(void)
-{
-        int irq = irq_alloc_desc(numa_node_id());
-        if (irq >= 0)
-                activate_irq(irq);
-
-        return irq;
-}
-
-void destroy_irq(unsigned int irq)
-{
-        irq_free_desc(irq);
-}
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c
index 93cec21e788b..f30ac9354ff2 100644
--- a/drivers/sh/intc/virq.c
+++ b/drivers/sh/intc/virq.c
@@ -219,12 +219,14 @@ restart:
                 if (radix_tree_deref_retry(entry))
                         goto restart;
 
-                irq = create_irq();
+                irq = irq_alloc_desc(numa_node_id());
                 if (unlikely(irq < 0)) {
                         pr_err("no more free IRQs, bailing..\n");
                         break;
                 }
 
+                activate_irq(irq);
+
                 pr_info("Setting up a chained VIRQ from %d -> %d\n",
                         irq, entry->pirq);