ia64: Use irq_init_desc

Switch over to the new interface. No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Grant Likely <grant.likely@linaro.org>
Tested-by: Tony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Link: http://lkml.kernel.org/r/20140507154340.782586778@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 12c3afee0f6fabcd664c12e7ddca1bf367bc401e..2f3abcf8f6bc9b2b206652b52cf1318f93acb74a 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -32,6 +32,7 @@ config IA64
        select GENERIC_IRQ_PROBE
        select GENERIC_PENDING_IRQ if SMP
        select GENERIC_IRQ_SHOW
+       select GENERIC_IRQ_LEGACY
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_IOMAP

diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 19f107be734e6e9db90c050b2389eb2a79cc1b71..cd44a57c73be76b48227c285b4cf0421f5efdc1f 100644 (file)
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -735,7 +735,7 @@ iosapic_register_intr (unsigned int gsi,
                rte = find_rte(irq, gsi);
                if(iosapic_intr_info[irq].count == 0) {
                        assign_irq_vector(irq);
-                       dynamic_irq_init(irq);
+                       irq_init_desc(irq);
                } else if (rte->refcnt != NO_REF_RTE) {
                        rte->refcnt++;
                        goto unlock_iosapic_lock;

diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 5774c3b65fe5f9ccfd86a273fbca514547249901..03ea78ed64a93384f8d4730720b99fa34e02b2d1 100644 (file)
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -382,8 +382,7 @@ void destroy_and_reserve_irq(unsigned int irq)
 {
        unsigned long flags;
 
-       dynamic_irq_cleanup(irq);
-
+       irq_init_desc(irq);
        spin_lock_irqsave(&vector_lock, flags);
        __clear_irq_vector(irq);
        irq_status[irq] = IRQ_RSVD;
@@ -416,13 +415,13 @@ int create_irq(void)
  out:
        spin_unlock_irqrestore(&vector_lock, flags);
        if (irq >= 0)
-               dynamic_irq_init(irq);
+               irq_init_desc(irq);
        return irq;
 }
 
 void destroy_irq(unsigned int irq)
 {
-       dynamic_irq_cleanup(irq);
+       irq_init_desc(irq);
        clear_irq_vector(irq);
 }