Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4debd723 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

ia64: Use irq_init_desc 



Switch over to the new interface. No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarGrant Likely <grant.likely@linaro.org>
Tested-by: default avatarTony 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent c940e01c

arch/ia64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/ia64/kernel/iosapic.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/ia64/kernel/irq_ia64.c

+3 −4
Original line number Diff line number Diff line
@@ -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);

}