Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ia64: Use irq_init_desc

Browse source 
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>
This commit is contained in:
Thomas Gleixner 2014-05-07 15:44:22 +00:00
parent c940e01c94
commit 4debd723f4
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/ia64/Kconfig
View file

@ -32,6 +32,7 @@ config IA64
select GENERIC_IRQ_PROBE select GENERIC_IRQ_PROBE
select GENERIC_PENDING_IRQ if SMP select GENERIC_PENDING_IRQ if SMP
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select GENERIC_IRQ_LEGACY
select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_OPTIONAL_GPIOLIB
select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_IOMAP select GENERIC_IOMAP

2
arch/ia64/kernel/iosapic.c
View file

@ -735,7 +735,7 @@ iosapic_register_intr (unsigned int gsi,
rte = find_rte(irq, gsi); rte = find_rte(irq, gsi);
if(iosapic_intr_info[irq].count == 0) { if(iosapic_intr_info[irq].count == 0) {
assign_irq_vector(irq); assign_irq_vector(irq);
dynamic_irq_init(irq); irq_init_desc(irq);
} else if (rte->refcnt != NO_REF_RTE) { } else if (rte->refcnt != NO_REF_RTE) {
rte->refcnt++; rte->refcnt++;
goto unlock_iosapic_lock; goto unlock_iosapic_lock;

7
arch/ia64/kernel/irq_ia64.c
View file

@ -382,8 +382,7 @@ void destroy_and_reserve_irq(unsigned int irq)
{ {
unsigned long flags; unsigned long flags;
dynamic_irq_cleanup(irq); irq_init_desc(irq);
spin_lock_irqsave(&vector_lock, flags); spin_lock_irqsave(&vector_lock, flags);
__clear_irq_vector(irq); __clear_irq_vector(irq);
irq_status[irq] = IRQ_RSVD; irq_status[irq] = IRQ_RSVD;
@ -416,13 +415,13 @@ int create_irq(void)
out: out:
spin_unlock_irqrestore(&vector_lock, flags); spin_unlock_irqrestore(&vector_lock, flags);
if (irq >= 0) if (irq >= 0)
dynamic_irq_init(irq); irq_init_desc(irq);
return irq; return irq;
} }
void destroy_irq(unsigned int irq) void destroy_irq(unsigned int irq)
{ {
dynamic_irq_cleanup(irq); irq_init_desc(irq);
clear_irq_vector(irq); clear_irq_vector(irq);
} }