Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / sh / intc / core.c

diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
index 8f32a13..81f2298 100644 (file)
--- a/drivers/sh/intc/core.c
+++ b/drivers/sh/intc/core.c
@@ -80,12 +80,6 @@ static void __init intc_register_irq(struct intc_desc *desc,
        unsigned int data[2], primary;
        unsigned long flags;
 
-       /*
-        * Register the IRQ position with the global IRQ map, then insert
-        * it in to the radix tree.
-        */
-       irq_reserve_irq(irq);
-
        raw_spin_lock_irqsave(&intc_big_lock, flags);
        radix_tree_insert(&d->tree, enum_id, intc_irq_xlate_get(irq));
        raw_spin_unlock_irqrestore(&intc_big_lock, flags);