ia64: remove obsolete hw_interrupt_type
PATCH 3/4 ia64: remove obsolete hw_interrupt_type
From: Thomas Gleixner <[email protected]>
The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t) have been kept around for migration reasons. After more than two years it's time to remove them finally.
This patch cleans up one of the remaining users. When all such patches hit mainline we can remove the defines and typedefs finally.
Impact: cleanup
Convert the last remaining users to struct irq_chip and remove the define.
Signed-off-by Thomas Gleixner <[email protected]>
Cc Tony Luck <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/ia64/hp/sim/hpsim_irq.c | 2 +- arch/ia64/include/asm/hw_irq.h | 2 +- arch/ia64/kernel/iosapic.c | 2 +- arch/ia64/kernel/irq_lsapic.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
arch/ia64/hp/sim/hpsim_irq.c renamed from arch/ia64/hp/sim/hpsim_irq.c~ia64-remove-obsolete-hw_interrupt_type +1 -1
@@ -27,7 +27,7 @@ hpsim_set_affinity_noop(unsigned int a,return 0 ; } -static struct hw_interrupt_type irq_type_hp_sim = { +static struct irq_chip irq_type_hp_sim = { .name ="hpsim" , .startup = hpsim_irq_startup, .shutdown = hpsim_irq_noop,
arch/ia64/include/asm/hw_irq.h renamed from arch/ia64/include/asm/hw_irq.h~ia64-remove-obsolete-hw_interrupt_type +1 -1
@@ -106,7 +106,7 @@ extern struct irq_cfg irq_cfg[NR_IRQS];#define irq_to_domain (x) irq_cfg[(x)].domainDECLARE_PER_CPU (int[IA64_NUM_VECTORS ], vector_irq); -extern struct hw_interrupt_type irq_type_ia64_lsapic;/* CPU-internal interrupt controller */ +extern struct irq_chip irq_type_ia64_lsapic;/* CPU-internal interrupt controller */ #ifdef CONFIG_PARAVIRT_GUEST #include <asm/paravirt.h>
arch/ia64/kernel/iosapic.c renamed from arch/ia64/kernel/iosapic.c~ia64-remove-obsolete-hw_interrupt_type +1 -1
@@ -601,7 +601,7 @@ register_intr (unsigned int gsi, int irq unsigned long polarity, unsigned long trigger) {struct irq_desc *idesc; -struct hw_interrupt_type *irq_type; +struct irq_chip *irq_type;int index;struct iosapic_rte_info *rte;
arch/ia64/kernel/irq_lsapic.c renamed from arch/ia64/kernel/irq_lsapic.c~ia64-remove-obsolete-hw_interrupt_type +1 -1
@@ -33,7 +33,7 @@ static int lsapic_retrigger(unsigned intreturn 1 ; } -struct hw_interrupt_type irq_type_ia64_lsapic = { +struct irq_chip irq_type_ia64_lsapic = { .name ="LSAPIC" , .startup = lsapic_noop_startup, .shutdown = lsapic_noop,
_