Skip to contentSkip to conversation

Remove obsolete genirq defines and typedefs

PATCH In review Thomas Gleixner 6 participants 26 messages Mar 11, 2009 – Apr 2, 2009

Subsystems (11)
Documentation x86 PowerPC MIPS +7 more subsystems
lore
Share & tools
lore
#0 lore raw

cover Remove obsolete genirq defines and typedefs

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 series cleans up the remaining users. When those patches hit mainline we can remove the defines and typedefs finally.

Thanks,

tglx

#1 lore raw

PATCH 1/18 genirq: prepare removal of obsolete defines and typedefs

---
 Documentation/feature-removal-schedule.txt |    9 +++++++++
 1 file changed, 9 insertions(+)
Documentation/feature-removal-schedule.txt +9 -0
Index: linux-2.6/Documentation/feature-removal-schedule.txt
===================================================================
@@ -344,3 +344,12 @@ Why:	See commits 129f8ae9b1b5be94517da76
 	Removal is subject to fixing any remaining bugs in ACPI which may
 	cause the thermal throttling not to happen at the right time.
 Who:	Dave Jones <[email protected]>, Matthew Garrett <[email protected]>
+
+---------------------------
+
+What:	obsolete generic irq defines and typedefs
+When:	2.6.30
+Why:	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
+Who:	Thomas Gleixner <[email protected]>
#2 lore raw

PATCH 2/18 ia64: convert obsolete no_irq_type to no_irq_chip

In reply to Thomas Gleixner

Impact: cleanup

convert the last remaining users to no_irq_chip

---
 arch/ia64/hp/sim/hpsim_irq.c |    2 +-
 arch/ia64/kernel/iosapic.c   |    2 +-
 arch/ia64/sn/kernel/irq.c    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/ia64/hp/sim/hpsim_irq.c +1 -1
Index: linux-2.6/arch/ia64/hp/sim/hpsim_irq.c
===================================================================
@@ -45,7 +45,7 @@ hpsim_irq_init (void)
 
 	for (i = 0; i < NR_IRQS; ++i) {
 		idesc = irq_desc + i;
-		if (idesc->chip == &no_irq_type)
+		if (idesc->chip == &no_irq_chip)
 			idesc->chip = &irq_type_hp_sim;
 	}
 }
arch/ia64/kernel/iosapic.c +1 -1
Index: linux-2.6/arch/ia64/kernel/iosapic.c
===================================================================
@@ -648,7 +648,7 @@ register_intr (unsigned int gsi, int irq
 
 	idesc = irq_desc + irq;
 	if (irq_type != NULL && idesc->chip != irq_type) {
-		if (idesc->chip != &no_irq_type)
+		if (idesc->chip != &no_irq_chip)
 			printk(KERN_WARNING
 			       "%s: changing vector %d from %s to %s\n",
 			       __func__, irq_to_vector(irq),
arch/ia64/sn/kernel/irq.c +1 -1
Index: linux-2.6/arch/ia64/sn/kernel/irq.c
===================================================================
@@ -299,7 +299,7 @@ void sn_irq_init(void)
 	ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR;
 
 	for (i = 0; i < NR_IRQS; i++) {
-		if (base_desc[i].chip == &no_irq_type) {
+		if (base_desc[i].chip == &no_irq_chip) {
 			base_desc[i].chip = &irq_type_sn;
 		}
 	}
#3 lore raw

PATCH 3/18 mn10300: convert obsolete no_irq_type to no_irq_chip

In reply to Thomas Gleixner

convert the last remaining users to no_irq_chip

---
 arch/mn10300/kernel/irq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mn10300/kernel/irq.c +1 -1
Index: linux-2.6/arch/mn10300/kernel/irq.c
===================================================================
@@ -140,7 +140,7 @@ void __init init_IRQ(void)
 	int irq;
 
 	for (irq = 0; irq < NR_IRQS; irq++)
-		if (irq_desc[irq].chip == &no_irq_type)
+		if (irq_desc[irq].chip == &no_irq_chip)
 			/* due to the PIC latching interrupt requests, even
 			 * when the IRQ is disabled, IRQ_PENDING is superfluous
 			 * and we can use handle_level_irq() for edge-triggered
#5 lore raw

PATCH 4/18 sh: convert obsolete no_irq_type to no_irq_chip

In reply to Thomas Gleixner

Impact: cleanup

convert the last remaining users to no_irq_chip

---
 arch/sh/kernel/sh_ksyms_32.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/sh/kernel/sh_ksyms_32.c +1 -2
Index: linux-2.6/arch/sh/kernel/sh_ksyms_32.c
===================================================================
@@ -19,13 +19,12 @@
 #include <asm/ftrace.h>
 
 extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
-extern struct hw_interrupt_type no_irq_type;
 
 /* platform dependent support */
 EXPORT_SYMBOL(dump_fpu);
 EXPORT_SYMBOL(kernel_thread);
 EXPORT_SYMBOL(irq_desc);
-EXPORT_SYMBOL(no_irq_type);
+EXPORT_SYMBOL(no_irq_chip);
 
 EXPORT_SYMBOL(strlen);
 
#6 lore raw

PATCH 5/18 ia64: convert obsolete irq_desc_t to struct irq_desc

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_desc.

---
 arch/ia64/hp/sim/hpsim_irq.c   |    2 +-
 arch/ia64/include/asm/hw_irq.h |    2 +-
 arch/ia64/kernel/iosapic.c     |    6 +++---
 arch/ia64/kernel/irq.c         |    2 +-
 arch/ia64/kernel/irq_ia64.c    |    2 +-
 arch/ia64/kernel/mca.c         |    2 +-
 arch/ia64/kernel/smpboot.c     |    2 +-
 arch/ia64/sn/kernel/irq.c      |    4 ++--
 arch/ia64/xen/irq_xen.c        |    2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
arch/ia64/hp/sim/hpsim_irq.c +1 -1
Index: linux-2.6/arch/ia64/hp/sim/hpsim_irq.c
===================================================================
@@ -40,7 +40,7 @@ static struct hw_interrupt_type irq_type
 void __init
 hpsim_irq_init (void)
 {
-	irq_desc_t *idesc;
+	struct irq_desc *idesc;
 	int i;
 
 	for (i = 0; i < NR_IRQS; ++i) {
arch/ia64/include/asm/hw_irq.h +1 -1
Index: linux-2.6/arch/ia64/include/asm/hw_irq.h
===================================================================
@@ -146,7 +146,7 @@ static inline void ia64_native_resend_ir
  * Default implementations for the irq-descriptor API:
  */
 
-extern irq_desc_t irq_desc[NR_IRQS];
+extern struct irq_desc irq_desc[NR_IRQS];
 
 #ifndef CONFIG_IA64_GENERIC
 static inline ia64_vector __ia64_irq_to_vector(int irq)
arch/ia64/kernel/iosapic.c +3 -3
Index: linux-2.6/arch/ia64/kernel/iosapic.c
===================================================================
@@ -449,7 +449,7 @@ iosapic_startup_edge_irq (unsigned int i
 static void
 iosapic_ack_edge_irq (unsigned int irq)
 {
-	irq_desc_t *idesc = irq_desc + irq;
+	struct irq_desc *idesc = irq_desc + irq;
 
 	irq_complete_move(irq);
 	move_native_irq(irq);
@@ -598,7 +598,7 @@ static int
 register_intr (unsigned int gsi, int irq, unsigned char delivery,
 	       unsigned long polarity, unsigned long trigger)
 {
-	irq_desc_t *idesc;
+	struct irq_desc *idesc;
 	struct hw_interrupt_type *irq_type;
 	int index;
 	struct iosapic_rte_info *rte;
@@ -826,7 +826,7 @@ iosapic_unregister_intr (unsigned int gs
 {
 	unsigned long flags;
 	int irq, index;
-	irq_desc_t *idesc;
+	struct irq_desc *idesc;
 	u32 low32;
 	unsigned long trigger, polarity;
 	unsigned int dest;
arch/ia64/kernel/irq.c +1 -1
Index: linux-2.6/arch/ia64/kernel/irq.c
===================================================================
@@ -130,7 +130,7 @@ unsigned int vectors_in_migration[NR_IRQ
  */
 static void migrate_irqs(void)
 {
-	irq_desc_t *desc;
+	struct irq_desc *desc;
 	int 		irq, new_cpu;
 
 	for (irq=0; irq < NR_IRQS; irq++) {
arch/ia64/kernel/irq_ia64.c +1 -1
Index: linux-2.6/arch/ia64/kernel/irq_ia64.c
===================================================================
@@ -624,7 +624,7 @@ static struct irqaction tlb_irqaction = 
 void
 ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action)
 {
-	irq_desc_t *desc;
+	struct irq_desc *desc;
 	unsigned int irq;
 
 	irq = vec;
arch/ia64/kernel/mca.c +1 -1
Index: linux-2.6/arch/ia64/kernel/mca.c
===================================================================
@@ -2093,7 +2093,7 @@ ia64_mca_late_init(void)
 	cpe_poll_timer.function = ia64_mca_cpe_poll;
 
 	{
-		irq_desc_t *desc;
+		struct irq_desc *desc;
 		unsigned int irq;
 
 		if (cpe_vector >= 0) {
arch/ia64/kernel/smpboot.c +1 -1
Index: linux-2.6/arch/ia64/kernel/smpboot.c
===================================================================
@@ -681,7 +681,7 @@ extern void fixup_irqs(void);
 int migrate_platform_irqs(unsigned int cpu)
 {
 	int new_cpei_cpu;
-	irq_desc_t *desc = NULL;
+	struct irq_desc *desc = NULL;
 	const struct cpumask *mask;
 	int 		retval = 0;
 
arch/ia64/sn/kernel/irq.c +2 -2
Index: linux-2.6/arch/ia64/sn/kernel/irq.c
===================================================================
@@ -293,7 +293,7 @@ unsigned int sn_local_vector_to_irq(u8 v
 void sn_irq_init(void)
 {
 	int i;
-	irq_desc_t *base_desc = irq_desc;
+	struct irq_desc *base_desc = irq_desc;
 
 	ia64_first_device_vector = IA64_SN2_FIRST_DEVICE_VECTOR;
 	ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR;
@@ -375,7 +375,7 @@ void sn_irq_fixup(struct pci_dev *pci_de
 	int cpu = nasid_slice_to_cpuid(nasid, slice);
 #ifdef CONFIG_SMP
 	int cpuphys;
-	irq_desc_t *desc;
+	struct irq_desc *desc;
 #endif
 
 	pci_dev_get(pci_dev);
arch/ia64/xen/irq_xen.c +1 -1
Index: linux-2.6/arch/ia64/xen/irq_xen.c
===================================================================
@@ -138,7 +138,7 @@ static void
 __xen_register_percpu_irq(unsigned int cpu, unsigned int vec,
 			struct irqaction *action, int save)
 {
-	irq_desc_t *desc;
+	struct irq_desc *desc;
 	int irq = 0;
 
 	if (xen_slab_ready) {
#7 lore raw

PATCH 6/18 drivers/mfd: convert obsolete irq_desc_t to struct irq_desc

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_desc.

---
 drivers/mfd/twl4030-irq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/twl4030-irq.c +1 -1
Index: linux-2.6/drivers/mfd/twl4030-irq.c
===================================================================
@@ -255,7 +255,7 @@ static int twl4030_irq_thread(void *data
  * thread.  All we do here is acknowledge and mask the interrupt and wakeup
  * the kernel thread.
  */
-static void handle_twl4030_pih(unsigned int irq, irq_desc_t *desc)
+static void handle_twl4030_pih(unsigned int irq, struct irq_desc *desc)
 {
 	/* Acknowledge, clear *AND* mask the interrupt... */
 	desc->chip->ack(irq);
#8 lore raw

PATCH 7/18 mips: convert obsolete irq_desc_t to struct irq_desc

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_desc.

---
 arch/mips/cavium-octeon/octeon-irq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/cavium-octeon/octeon-irq.c +1 -1
Index: linux-2.6/arch/mips/cavium-octeon/octeon-irq.c
===================================================================
@@ -31,7 +31,7 @@ static void octeon_irq_core_ack(unsigned
 
 static void octeon_irq_core_eoi(unsigned int irq)
 {
-	irq_desc_t *desc = irq_desc + irq;
+	struct irq_desc *desc = irq_desc + irq;
 	unsigned int bit = irq - OCTEON_IRQ_SW0;
 	/*
 	 * If an IRQ is being processed while we are disabling it the
#9 lore raw

Re: [patch 07/18] mips: convert obsolete irq_desc_t to struct irq_desc

Quoted 6 lines · Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_desc.

My boards still boot with this patch.

Thanks,
David Daney

Quoted 26 lines
---
 arch/mips/cavium-octeon/octeon-irq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/arch/mips/cavium-octeon/octeon-irq.c
===================================================================

arch/mips/cavium-octeon/octeon-irq.c +1 -2
@@ -31,7 +31,7 @@ static void octeon_irq_core_ack(unsigned
 
 static void octeon_irq_core_eoi(unsigned int irq)
 {
-	irq_desc_t *desc = irq_desc + irq;
+	struct irq_desc *desc = irq_desc + irq;
 	unsigned int bit = irq - OCTEON_IRQ_SW0;
 	/*
 	 * If an IRQ is being processed while we are disabling it the
 
 
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#11 lore raw

PATCH 8/18 powerpc: convert obsolete irq_desc_t to struct irq_desc

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users.

---
 arch/powerpc/kernel/irq.c            |    4 ++--
 arch/powerpc/platforms/iseries/irq.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/kernel/irq.c +2 -2
Index: linux-2.6/arch/powerpc/kernel/irq.c
===================================================================
@@ -171,7 +171,7 @@ int show_interrupts(struct seq_file *p, 
 {
 	int i = *(loff_t *)v, j;
 	struct irqaction *action;
-	irq_desc_t *desc;
+	struct irq_desc *desc;
 	unsigned long flags;
 
 	if (i == 0) {
@@ -1038,7 +1038,7 @@ arch_initcall(irq_late_init);
 static int virq_debug_show(struct seq_file *m, void *private)
 {
 	unsigned long flags;
-	irq_desc_t *desc;
+	struct irq_desc *desc;
 	const char *p;
 	char none[] = "none";
 	int i;
arch/powerpc/platforms/iseries/irq.c +1 -1
Index: linux-2.6/arch/powerpc/platforms/iseries/irq.c
===================================================================
@@ -214,7 +214,7 @@ void __init iSeries_activate_IRQs()
 	unsigned long flags;
 
 	for_each_irq (irq) {
-		irq_desc_t *desc = get_irq_desc(irq);
+		struct irq_desc *desc = get_irq_desc(irq);
 
 		if (desc && desc->chip && desc->chip->startup) {
 			spin_lock_irqsave(&desc->lock, flags);
#12 lore raw

Re: [patch 08/18] powerpc: convert obsolete irq_desc_t to struct irq_desc

Quoted 5 lines · Thomas Gleixner

plain text document attachment (powerpc-convert-obsolete-irq-desc-t-typedef.patch)
Impact: cleanup

Convert the last remaining users.

Ack. This would be more easily carried in my -next tree if that's ok with you.

Quoted 44 lines
---
 arch/powerpc/kernel/irq.c            |    4 ++--
 arch/powerpc/platforms/iseries/irq.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6/arch/powerpc/kernel/irq.c
===================================================================

arch/powerpc/kernel/irq.c +2 -2
@@ -171,7 +171,7 @@ int show_interrupts(struct seq_file *p, 
 {
 	int i = *(loff_t *)v, j;
 	struct irqaction *action;
-	irq_desc_t *desc;
+	struct irq_desc *desc;
 	unsigned long flags;
 
 	if (i == 0) {
@@ -1038,7 +1038,7 @@ arch_initcall(irq_late_init);
 static int virq_debug_show(struct seq_file *m, void *private)
 {
 	unsigned long flags;
-	irq_desc_t *desc;
+	struct irq_desc *desc;
 	const char *p;
 	char none[] = "none";
 	int i;

Index: linux-2.6/arch/powerpc/platforms/iseries/irq.c
===================================================================

arch/powerpc/platforms/iseries/irq.c +1 -1
@@ -214,7 +214,7 @@ void __init iSeries_activate_IRQs()
 	unsigned long flags;
 
 	for_each_irq (irq) {
-		irq_desc_t *desc = get_irq_desc(irq);
+		struct irq_desc *desc = get_irq_desc(irq);
 
 		if (desc && desc->chip && desc->chip->startup) {
 			spin_lock_irqsave(&desc->lock, flags);
#13 lore raw

Re: [patch 08/18] powerpc: convert obsolete irq_desc_t to struct irq_desc

Quoted 9 lines · Benjamin Herrenschmidt
Quoted 5 lines · Thomas Gleixner

plain text document attachment (powerpc-convert-obsolete-irq-desc-t-typedef.patch)
Impact: cleanup

Convert the last remaining users.

Ack. This would be more easily carried in my -next tree if that's ok with you.

Sure. Thanks,

tglx

#14 lore raw

PATCH 9/18 x86: convert obsolete irq_desc_t to struct irq_desc

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_desc.

---
 arch/x86/kernel/visws_quirks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/visws_quirks.c +1 -1
Index: linux-2.6/arch/x86/kernel/visws_quirks.c
===================================================================
@@ -584,7 +584,7 @@ static struct irq_chip piix4_virtual_irq
 static irqreturn_t piix4_master_intr(int irq, void *dev_id)
 {
 	int realirq;
-	irq_desc_t *desc;
+	struct irq_desc *desc;
 	unsigned long flags;
 
 	spin_lock_irqsave(&i8259A_lock, flags);
#15 lore raw

PATCH 10/18 alpha: convert obsolete hw_interrupt_type to struct irq_chip

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_chip.

CC Richard Henderson <[email protected]>
---
 arch/alpha/kernel/irq_alpha.c     |    2 +-
 arch/alpha/kernel/irq_i8259.c     |    2 +-
 arch/alpha/kernel/irq_impl.h      |    2 +-
 arch/alpha/kernel/irq_pyxis.c     |    2 +-
 arch/alpha/kernel/irq_srm.c       |    2 +-
 arch/alpha/kernel/sys_alcor.c     |    2 +-
 arch/alpha/kernel/sys_cabriolet.c |    2 +-
 arch/alpha/kernel/sys_dp264.c     |    6 +++---
 arch/alpha/kernel/sys_eb64p.c     |    2 +-
 arch/alpha/kernel/sys_eiger.c     |    2 +-
 arch/alpha/kernel/sys_jensen.c    |    2 +-
 arch/alpha/kernel/sys_marvel.c    |   10 +++++-----
 arch/alpha/kernel/sys_mikasa.c    |    2 +-
 arch/alpha/kernel/sys_noritake.c  |    2 +-
 arch/alpha/kernel/sys_rawhide.c   |    2 +-
 arch/alpha/kernel/sys_rx164.c     |    2 +-
 arch/alpha/kernel/sys_sable.c     |    2 +-
 arch/alpha/kernel/sys_takara.c    |    2 +-
 arch/alpha/kernel/sys_titan.c     |    4 ++--
 arch/alpha/kernel/sys_wildfire.c  |    2 +-
 20 files changed, 27 insertions(+), 27 deletions(-)
arch/alpha/kernel/irq_alpha.c +1 -1
Index: linux-2.6/arch/alpha/kernel/irq_alpha.c
===================================================================
@@ -227,7 +227,7 @@ struct irqaction timer_irqaction = {
 	.name		= "timer",
 };
 
-static struct hw_interrupt_type rtc_irq_type = {
+static struct irq_chip rtc_irq_type = {
 	.typename	= "RTC",
 	.startup	= rtc_startup,
 	.shutdown	= rtc_enable_disable,
arch/alpha/kernel/irq_i8259.c +1 -1
Index: linux-2.6/arch/alpha/kernel/irq_i8259.c
===================================================================
@@ -83,7 +83,7 @@ i8259a_end_irq(unsigned int irq)
 		i8259a_enable_irq(irq);
 }
 
-struct hw_interrupt_type i8259a_irq_type = {
+struct irq_chip i8259a_irq_type = {
 	.typename	= "XT-PIC",
 	.startup	= i8259a_startup_irq,
 	.shutdown	= i8259a_disable_irq,
arch/alpha/kernel/irq_impl.h +1 -1
Index: linux-2.6/arch/alpha/kernel/irq_impl.h
===================================================================
@@ -36,7 +36,7 @@ extern void i8259a_disable_irq(unsigned 
 extern void i8259a_mask_and_ack_irq(unsigned int);
 extern unsigned int i8259a_startup_irq(unsigned int);
 extern void i8259a_end_irq(unsigned int);
-extern struct hw_interrupt_type i8259a_irq_type;
+extern struct irq_chip i8259a_irq_type;
 extern void init_i8259a_irqs(void);
 
 extern void handle_irq(int irq);
arch/alpha/kernel/irq_pyxis.c +1 -1
Index: linux-2.6/arch/alpha/kernel/irq_pyxis.c
===================================================================
@@ -70,7 +70,7 @@ pyxis_mask_and_ack_irq(unsigned int irq)
 	*(vulp)PYXIS_INT_MASK;
 }
 
-static struct hw_interrupt_type pyxis_irq_type = {
+static struct irq_chip pyxis_irq_type = {
 	.typename	= "PYXIS",
 	.startup	= pyxis_startup_irq,
 	.shutdown	= pyxis_disable_irq,
arch/alpha/kernel/irq_srm.c +1 -1
Index: linux-2.6/arch/alpha/kernel/irq_srm.c
===================================================================
@@ -48,7 +48,7 @@ srm_end_irq(unsigned int irq)
 }
 
 /* Handle interrupts from the SRM, assuming no additional weirdness.  */
-static struct hw_interrupt_type srm_irq_type = {
+static struct irq_chip srm_irq_type = {
 	.typename	= "SRM",
 	.startup	= srm_startup_irq,
 	.shutdown	= srm_disable_irq,
arch/alpha/kernel/sys_alcor.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_alcor.c
===================================================================
@@ -89,7 +89,7 @@ alcor_end_irq(unsigned int irq)
 		alcor_enable_irq(irq);
 }
 
-static struct hw_interrupt_type alcor_irq_type = {
+static struct irq_chip alcor_irq_type = {
 	.typename	= "ALCOR",
 	.startup	= alcor_startup_irq,
 	.shutdown	= alcor_disable_irq,
arch/alpha/kernel/sys_cabriolet.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_cabriolet.c
===================================================================
@@ -71,7 +71,7 @@ cabriolet_end_irq(unsigned int irq)
 		cabriolet_enable_irq(irq);
 }
 
-static struct hw_interrupt_type cabriolet_irq_type = {
+static struct irq_chip cabriolet_irq_type = {
 	.typename	= "CABRIOLET",
 	.startup	= cabriolet_startup_irq,
 	.shutdown	= cabriolet_disable_irq,
arch/alpha/kernel/sys_dp264.c +3 -3
Index: linux-2.6/arch/alpha/kernel/sys_dp264.c
===================================================================
@@ -194,7 +194,7 @@ clipper_set_affinity(unsigned int irq, c
 	spin_unlock(&dp264_irq_lock);
 }
 
-static struct hw_interrupt_type dp264_irq_type = {
+static struct irq_chip dp264_irq_type = {
 	.typename	= "DP264",
 	.startup	= dp264_startup_irq,
 	.shutdown	= dp264_disable_irq,
@@ -205,7 +205,7 @@ static struct hw_interrupt_type dp264_ir
 	.set_affinity	= dp264_set_affinity,
 };
 
-static struct hw_interrupt_type clipper_irq_type = {
+static struct irq_chip clipper_irq_type = {
 	.typename	= "CLIPPER",
 	.startup	= clipper_startup_irq,
 	.shutdown	= clipper_disable_irq,
@@ -294,7 +294,7 @@ clipper_srm_device_interrupt(unsigned lo
 }
 
 static void __init
-init_tsunami_irqs(struct hw_interrupt_type * ops, int imin, int imax)
+init_tsunami_irqs(struct irq_chip * ops, int imin, int imax)
 {
 	long i;
 	for (i = imin; i <= imax; ++i) {
arch/alpha/kernel/sys_eb64p.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_eb64p.c
===================================================================
@@ -69,7 +69,7 @@ eb64p_end_irq(unsigned int irq)
 		eb64p_enable_irq(irq);
 }
 
-static struct hw_interrupt_type eb64p_irq_type = {
+static struct irq_chip eb64p_irq_type = {
 	.typename	= "EB64P",
 	.startup	= eb64p_startup_irq,
 	.shutdown	= eb64p_disable_irq,
arch/alpha/kernel/sys_eiger.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_eiger.c
===================================================================
@@ -80,7 +80,7 @@ eiger_end_irq(unsigned int irq)
 		eiger_enable_irq(irq);
 }
 
-static struct hw_interrupt_type eiger_irq_type = {
+static struct irq_chip eiger_irq_type = {
 	.typename	= "EIGER",
 	.startup	= eiger_startup_irq,
 	.shutdown	= eiger_disable_irq,
arch/alpha/kernel/sys_jensen.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_jensen.c
===================================================================
@@ -118,7 +118,7 @@ jensen_local_end(unsigned int irq)
 		i8259a_end_irq(1);
 }
 
-static struct hw_interrupt_type jensen_local_irq_type = {
+static struct irq_chip jensen_local_irq_type = {
 	.typename	= "LOCAL",
 	.startup	= jensen_local_startup,
 	.shutdown	= jensen_local_shutdown,
arch/alpha/kernel/sys_marvel.c +5 -5
Index: linux-2.6/arch/alpha/kernel/sys_marvel.c
===================================================================
@@ -169,7 +169,7 @@ marvel_irq_noop_return(unsigned int irq)
 	return 0; 
 }
 
-static struct hw_interrupt_type marvel_legacy_irq_type = {
+static struct irq_chip marvel_legacy_irq_type = {
 	.typename	= "LEGACY",
 	.startup	= marvel_irq_noop_return,
 	.shutdown	= marvel_irq_noop,
@@ -179,7 +179,7 @@ static struct hw_interrupt_type marvel_l
 	.end		= marvel_irq_noop,
 };
 
-static struct hw_interrupt_type io7_lsi_irq_type = {
+static struct irq_chip io7_lsi_irq_type = {
 	.typename	= "LSI",
 	.startup	= io7_startup_irq,
 	.shutdown	= io7_disable_irq,
@@ -189,7 +189,7 @@ static struct hw_interrupt_type io7_lsi_
 	.end		= io7_end_irq,
 };
 
-static struct hw_interrupt_type io7_msi_irq_type = {
+static struct irq_chip io7_msi_irq_type = {
 	.typename	= "MSI",
 	.startup	= io7_startup_irq,
 	.shutdown	= io7_disable_irq,
@@ -273,8 +273,8 @@ init_one_io7_msi(struct io7 *io7, unsign
 
 static void __init
 init_io7_irqs(struct io7 *io7, 
-	      struct hw_interrupt_type *lsi_ops,
-	      struct hw_interrupt_type *msi_ops)
+	      struct irq_chip *lsi_ops,
+	      struct irq_chip *msi_ops)
 {
 	long base = (io7->pe << MARVEL_IRQ_VEC_PE_SHIFT) + 16;
 	long i;
arch/alpha/kernel/sys_mikasa.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_mikasa.c
===================================================================
@@ -68,7 +68,7 @@ mikasa_end_irq(unsigned int irq)
 		mikasa_enable_irq(irq);
 }
 
-static struct hw_interrupt_type mikasa_irq_type = {
+static struct irq_chip mikasa_irq_type = {
 	.typename	= "MIKASA",
 	.startup	= mikasa_startup_irq,
 	.shutdown	= mikasa_disable_irq,
arch/alpha/kernel/sys_noritake.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_noritake.c
===================================================================
@@ -73,7 +73,7 @@ noritake_end_irq(unsigned int irq)
                 noritake_enable_irq(irq);
 }
 
-static struct hw_interrupt_type noritake_irq_type = {
+static struct irq_chip noritake_irq_type = {
 	.typename	= "NORITAKE",
 	.startup	= noritake_startup_irq,
 	.shutdown	= noritake_disable_irq,
arch/alpha/kernel/sys_rawhide.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_rawhide.c
===================================================================
@@ -135,7 +135,7 @@ rawhide_end_irq(unsigned int irq)
 		rawhide_enable_irq(irq);
 }
 
-static struct hw_interrupt_type rawhide_irq_type = {
+static struct irq_chip rawhide_irq_type = {
 	.typename	= "RAWHIDE",
 	.startup	= rawhide_startup_irq,
 	.shutdown	= rawhide_disable_irq,
arch/alpha/kernel/sys_rx164.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_rx164.c
===================================================================
@@ -72,7 +72,7 @@ rx164_end_irq(unsigned int irq)
 		rx164_enable_irq(irq);
 }
 
-static struct hw_interrupt_type rx164_irq_type = {
+static struct irq_chip rx164_irq_type = {
 	.typename	= "RX164",
 	.startup	= rx164_startup_irq,
 	.shutdown	= rx164_disable_irq,
arch/alpha/kernel/sys_sable.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_sable.c
===================================================================
@@ -501,7 +501,7 @@ sable_lynx_mask_and_ack_irq(unsigned int
 	spin_unlock(&sable_lynx_irq_lock);
 }
 
-static struct hw_interrupt_type sable_lynx_irq_type = {
+static struct irq_chip sable_lynx_irq_type = {
 	.typename	= "SABLE/LYNX",
 	.startup	= sable_lynx_startup_irq,
 	.shutdown	= sable_lynx_disable_irq,
arch/alpha/kernel/sys_takara.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_takara.c
===================================================================
@@ -74,7 +74,7 @@ takara_end_irq(unsigned int irq)
 		takara_enable_irq(irq);
 }
 
-static struct hw_interrupt_type takara_irq_type = {
+static struct irq_chip takara_irq_type = {
 	.typename	= "TAKARA",
 	.startup	= takara_startup_irq,
 	.shutdown	= takara_disable_irq,
arch/alpha/kernel/sys_titan.c +2 -2
Index: linux-2.6/arch/alpha/kernel/sys_titan.c
===================================================================
@@ -183,7 +183,7 @@ titan_srm_device_interrupt(unsigned long
 
 
 static void __init
-init_titan_irqs(struct hw_interrupt_type * ops, int imin, int imax)
+init_titan_irqs(struct irq_chip * ops, int imin, int imax)
 {
 	long i;
 	for (i = imin; i <= imax; ++i) {
@@ -192,7 +192,7 @@ init_titan_irqs(struct hw_interrupt_type
 	}
 }
 
-static struct hw_interrupt_type titan_irq_type = {
+static struct irq_chip titan_irq_type = {
        .typename       = "TITAN",
        .startup        = titan_startup_irq,
        .shutdown       = titan_disable_irq,
arch/alpha/kernel/sys_wildfire.c +1 -1
Index: linux-2.6/arch/alpha/kernel/sys_wildfire.c
===================================================================
@@ -157,7 +157,7 @@ wildfire_end_irq(unsigned int irq)
 		wildfire_enable_irq(irq);
 }
 
-static struct hw_interrupt_type wildfire_irq_type = {
+static struct irq_chip wildfire_irq_type = {
 	.typename	= "WILDFIRE",
 	.startup	= wildfire_startup_irq,
 	.shutdown	= wildfire_disable_irq,
#16 lore raw

PATCH 11/18 avr32: convert obsolete hw_interrupt_type to struct irq_chip

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_chip.

CC Haavard Skinnemoen <[email protected]>
---
 arch/avr32/include/asm/hw_irq.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/avr32/include/asm/hw_irq.h +1 -1
Index: linux-2.6/arch/avr32/include/asm/hw_irq.h
===================================================================
@@ -1,7 +1,7 @@
 #ifndef __ASM_AVR32_HW_IRQ_H
 #define __ASM_AVR32_HW_IRQ_H
 
-static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i)
+static inline void hw_resend_irq(struct irq_chip *h, unsigned int i)
 {
 	/* Nothing to do */
 }
#17 lore raw

PATCH 12/18 cris: convert obsolete hw_interrupt_type to struct irq_chip

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_chip.

---
 arch/cris/arch-v10/kernel/irq.c |    2 +-
 arch/cris/arch-v32/kernel/irq.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/cris/arch-v10/kernel/irq.c +1 -1
Index: linux-2.6/arch/cris/arch-v10/kernel/irq.c
===================================================================
@@ -132,7 +132,7 @@ static void end_crisv10_irq(unsigned int
 {
 }
 
-static struct hw_interrupt_type crisv10_irq_type = {
+static struct irq_chip crisv10_irq_type = {
 	.typename =    "CRISv10",
 	.startup =     startup_crisv10_irq,
 	.shutdown =    shutdown_crisv10_irq,
arch/cris/arch-v32/kernel/irq.c +1 -1
Index: linux-2.6/arch/cris/arch-v32/kernel/irq.c
===================================================================
@@ -333,7 +333,7 @@ void set_affinity_crisv32_irq(unsigned i
 	spin_unlock_irqrestore(&irq_lock, flags);
 }
 
-static struct hw_interrupt_type crisv32_irq_type = {
+static struct irq_chip crisv32_irq_type = {
 	.typename =    "CRISv32",
 	.startup =     startup_crisv32_irq,
 	.shutdown =    shutdown_crisv32_irq,
#19 lore raw

PATCH 13/18 ia64: convert obsolete hw_interrupt_type to struct irq_chip

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_chip.

---
 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 +1 -1
Index: linux-2.6/arch/ia64/hp/sim/hpsim_irq.c
===================================================================
@@ -26,7 +26,7 @@ hpsim_set_affinity_noop(unsigned int a, 
 {
 }
 
-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 +1 -1
Index: linux-2.6/arch/ia64/include/asm/hw_irq.h
===================================================================
@@ -106,7 +106,7 @@ extern struct irq_cfg irq_cfg[NR_IRQS];
 #define irq_to_domain(x)	irq_cfg[(x)].domain
 DECLARE_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 +1 -1
Index: linux-2.6/arch/ia64/kernel/iosapic.c
===================================================================
@@ -599,7 +599,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 +1 -1
Index: linux-2.6/arch/ia64/kernel/irq_lsapic.c
===================================================================
@@ -33,7 +33,7 @@ static int lsapic_retrigger(unsigned int
 	return 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,
#20 lore raw

PATCH 14/18 m32r: convert obsolete hw_interrupt_type to struct irq_chip

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_chip.

---
 arch/m32r/platforms/m32104ut/setup.c |    2 +-
 arch/m32r/platforms/m32700ut/setup.c |    8 ++++----
 arch/m32r/platforms/mappi/setup.c    |    2 +-
 arch/m32r/platforms/mappi2/setup.c   |    2 +-
 arch/m32r/platforms/mappi3/setup.c   |    2 +-
 arch/m32r/platforms/oaks32r/setup.c  |    2 +-
 arch/m32r/platforms/opsput/setup.c   |    8 ++++----
 arch/m32r/platforms/usrv/setup.c     |    4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)
arch/m32r/platforms/m32104ut/setup.c +1 -1
Index: linux-2.6/arch/m32r/platforms/m32104ut/setup.c
===================================================================
@@ -63,7 +63,7 @@ static void shutdown_m32104ut_irq(unsign
 	outl(M32R_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type m32104ut_irq_type =
+static struct irq_chip m32104ut_irq_type =
 {
 	.typename = "M32104UT-IRQ",
 	.startup = startup_m32104ut_irq,
arch/m32r/platforms/m32700ut/setup.c +4 -4
Index: linux-2.6/arch/m32r/platforms/m32700ut/setup.c
===================================================================
@@ -69,7 +69,7 @@ static void shutdown_m32700ut_irq(unsign
 	outl(M32R_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type m32700ut_irq_type =
+static struct irq_chip m32700ut_irq_type =
 {
 	.typename = "M32700UT-IRQ",
 	.startup = startup_m32700ut_irq,
@@ -146,7 +146,7 @@ static void shutdown_m32700ut_pld_irq(un
 	outw(PLD_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type m32700ut_pld_irq_type =
+static struct irq_chip m32700ut_pld_irq_type =
 {
 	.typename = "M32700UT-PLD-IRQ",
 	.startup = startup_m32700ut_pld_irq,
@@ -215,7 +215,7 @@ static void shutdown_m32700ut_lanpld_irq
 	outw(PLD_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type m32700ut_lanpld_irq_type =
+static struct irq_chip m32700ut_lanpld_irq_type =
 {
 	.typename = "M32700UT-PLD-LAN-IRQ",
 	.startup = startup_m32700ut_lanpld_irq,
@@ -284,7 +284,7 @@ static void shutdown_m32700ut_lcdpld_irq
 	outw(PLD_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type m32700ut_lcdpld_irq_type =
+static struct irq_chip m32700ut_lcdpld_irq_type =
 {
 	.typename = "M32700UT-PLD-LCD-IRQ",
 	.startup = startup_m32700ut_lcdpld_irq,
arch/m32r/platforms/mappi/setup.c +1 -1
Index: linux-2.6/arch/m32r/platforms/mappi/setup.c
===================================================================
@@ -63,7 +63,7 @@ static void shutdown_mappi_irq(unsigned 
 	outl(M32R_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type mappi_irq_type =
+static struct irq_chip mappi_irq_type =
 {
 	.typename = "MAPPI-IRQ",
 	.startup = startup_mappi_irq,
arch/m32r/platforms/mappi2/setup.c +1 -1
Index: linux-2.6/arch/m32r/platforms/mappi2/setup.c
===================================================================
@@ -70,7 +70,7 @@ static void shutdown_mappi2_irq(unsigned
 	outl(M32R_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type mappi2_irq_type =
+static struct irq_chip mappi2_irq_type =
 {
 	.typename = "MAPPI2-IRQ",
 	.startup = startup_mappi2_irq,
arch/m32r/platforms/mappi3/setup.c +1 -1
Index: linux-2.6/arch/m32r/platforms/mappi3/setup.c
===================================================================
@@ -70,7 +70,7 @@ static void shutdown_mappi3_irq(unsigned
 	outl(M32R_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type mappi3_irq_type =
+static struct irq_chip mappi3_irq_type =
 {
 	.typename = "MAPPI3-IRQ",
 	.startup = startup_mappi3_irq,
arch/m32r/platforms/oaks32r/setup.c +1 -1
Index: linux-2.6/arch/m32r/platforms/oaks32r/setup.c
===================================================================
@@ -61,7 +61,7 @@ static void shutdown_oaks32r_irq(unsigne
 	outl(M32R_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type oaks32r_irq_type =
+static struct irq_chip oaks32r_irq_type =
 {
 	.typename = "OAKS32R-IRQ",
 	.startup = startup_oaks32r_irq,
arch/m32r/platforms/opsput/setup.c +4 -4
Index: linux-2.6/arch/m32r/platforms/opsput/setup.c
===================================================================
@@ -70,7 +70,7 @@ static void shutdown_opsput_irq(unsigned
 	outl(M32R_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type opsput_irq_type =
+static struct irq_chip opsput_irq_type =
 {
 	.typename = "OPSPUT-IRQ",
 	.startup = startup_opsput_irq,
@@ -147,7 +147,7 @@ static void shutdown_opsput_pld_irq(unsi
 	outw(PLD_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type opsput_pld_irq_type =
+static struct irq_chip opsput_pld_irq_type =
 {
 	.typename = "OPSPUT-PLD-IRQ",
 	.startup = startup_opsput_pld_irq,
@@ -216,7 +216,7 @@ static void shutdown_opsput_lanpld_irq(u
 	outw(PLD_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type opsput_lanpld_irq_type =
+static struct irq_chip opsput_lanpld_irq_type =
 {
 	.typename = "OPSPUT-PLD-LAN-IRQ",
 	.startup = startup_opsput_lanpld_irq,
@@ -285,7 +285,7 @@ static void shutdown_opsput_lcdpld_irq(u
 	outw(PLD_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type opsput_lcdpld_irq_type =
+static struct irq_chip opsput_lcdpld_irq_type =
 {
 	"OPSPUT-PLD-LCD-IRQ",
 	startup_opsput_lcdpld_irq,
arch/m32r/platforms/usrv/setup.c +2 -2
Index: linux-2.6/arch/m32r/platforms/usrv/setup.c
===================================================================
@@ -61,7 +61,7 @@ static void shutdown_mappi_irq(unsigned 
 	outl(M32R_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type mappi_irq_type =
+static struct irq_chip mappi_irq_type =
 {
 	.typename = "M32700-IRQ",
 	.startup = startup_mappi_irq,
@@ -134,7 +134,7 @@ static void shutdown_m32700ut_pld_irq(un
 	outw(PLD_ICUCR_ILEVEL7, port);
 }
 
-static struct hw_interrupt_type m32700ut_pld_irq_type =
+static struct irq_chip m32700ut_pld_irq_type =
 {
 	.typename = "USRV-PLD-IRQ",
 	.startup = startup_m32700ut_pld_irq,
#21 lore raw

PATCH 15/18 parisc: convert obsolete hw_interrupt_type to struct irq_chip

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_chip.

---
 arch/parisc/kernel/irq.c |    2 +-
 drivers/parisc/dino.c    |    2 +-
 drivers/parisc/eisa.c    |    2 +-
 drivers/parisc/gsc.c     |    4 ++--
 drivers/parisc/gsc.h     |    2 +-
 drivers/parisc/iosapic.c |    2 +-
 drivers/parisc/superio.c |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
arch/parisc/kernel/irq.c +1 -1
Index: linux-2.6/arch/parisc/kernel/irq.c
===================================================================
@@ -140,7 +140,7 @@ static void cpu_set_affinity_irq(unsigne
 }
 #endif
 
-static struct hw_interrupt_type cpu_interrupt_type = {
+static struct irq_chip cpu_interrupt_type = {
 	.typename	= "CPU",
 	.startup	= cpu_startup_irq,
 	.shutdown	= cpu_disable_irq,
drivers/parisc/dino.c +1 -1
Index: linux-2.6/drivers/parisc/dino.c
===================================================================
@@ -353,7 +353,7 @@ static unsigned int dino_startup_irq(uns
 	return 0;
 }
 
-static struct hw_interrupt_type dino_interrupt_type = {
+static struct irq_chip dino_interrupt_type = {
 	.typename	= "GSC-PCI",
 	.startup	= dino_startup_irq,
 	.shutdown	= dino_disable_irq,
drivers/parisc/eisa.c +1 -1
Index: linux-2.6/drivers/parisc/eisa.c
===================================================================
@@ -188,7 +188,7 @@ static unsigned int eisa_startup_irq(uns
 	return 0;
 }
 
-static struct hw_interrupt_type eisa_interrupt_type = {
+static struct irq_chip eisa_interrupt_type = {
 	.typename =	"EISA",
 	.startup =	eisa_startup_irq,
 	.shutdown =	eisa_disable_irq,
drivers/parisc/gsc.c +2 -2
Index: linux-2.6/drivers/parisc/gsc.c
===================================================================
@@ -148,7 +148,7 @@ static unsigned int gsc_asic_startup_irq
 	return 0;
 }
 
-static struct hw_interrupt_type gsc_asic_interrupt_type = {
+static struct irq_chip gsc_asic_interrupt_type = {
 	.typename =	"GSC-ASIC",
 	.startup =	gsc_asic_startup_irq,
 	.shutdown =	gsc_asic_disable_irq,
@@ -158,7 +158,7 @@ static struct hw_interrupt_type gsc_asic
 	.end =		no_end_irq,
 };
 
-int gsc_assign_irq(struct hw_interrupt_type *type, void *data)
+int gsc_assign_irq(struct irq_chip *type, void *data)
 {
 	static int irq = GSC_IRQ_BASE;
 	struct irq_desc *desc;
drivers/parisc/gsc.h +1 -1
Index: linux-2.6/drivers/parisc/gsc.h
===================================================================
@@ -38,7 +38,7 @@ struct gsc_asic {
 int gsc_common_setup(struct parisc_device *parent, struct gsc_asic *gsc_asic);
 int gsc_alloc_irq(struct gsc_irq *dev);			/* dev needs an irq */
 int gsc_claim_irq(struct gsc_irq *dev, int irq);	/* dev needs this irq */
-int gsc_assign_irq(struct hw_interrupt_type *type, void *data);
+int gsc_assign_irq(struct irq_chip *type, void *data);
 int gsc_find_local_irq(unsigned int irq, int *global_irq, int limit);
 void gsc_fixup_irqs(struct parisc_device *parent, void *ctrl,
 		void (*choose)(struct parisc_device *child, void *ctrl));
drivers/parisc/iosapic.c +1 -1
Index: linux-2.6/drivers/parisc/iosapic.c
===================================================================
@@ -725,7 +725,7 @@ static void iosapic_set_affinity_irq(uns
 }
 #endif
 
-static struct hw_interrupt_type iosapic_interrupt_type = {
+static struct irq_chip iosapic_interrupt_type = {
 	.typename =	"IO-SAPIC-level",
 	.startup =	iosapic_startup_irq,
 	.shutdown =	iosapic_disable_irq,
drivers/parisc/superio.c +1 -1
Index: linux-2.6/drivers/parisc/superio.c
===================================================================
@@ -325,7 +325,7 @@ static unsigned int superio_startup_irq(
 	return 0;
 }
 
-static struct hw_interrupt_type superio_interrupt_type = {
+static struct irq_chip superio_interrupt_type = {
 	.typename =	SUPERIO,
 	.startup =	superio_startup_irq,
 	.shutdown =	superio_disable_irq,
#22 lore raw

PATCH 16/18 powerpc: convert obsolete hw_interrupt_type to struct irq_chip

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_chip.

---
 arch/powerpc/include/asm/hw_irq.h     |    2 +-
 arch/powerpc/platforms/powermac/pic.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/hw_irq.h +1 -1
Index: linux-2.6/arch/powerpc/include/asm/hw_irq.h
===================================================================
@@ -129,7 +129,7 @@ static inline int irqs_disabled_flags(un
  * interrupt-retrigger: should we handle this via lost interrupts and IPIs
  * or should we not care like we do now ? --BenH.
  */
-struct hw_interrupt_type;
+struct irq_chip;
 
 #endif	/* __KERNEL__ */
 #endif	/* _ASM_POWERPC_HW_IRQ_H */
arch/powerpc/platforms/powermac/pic.h +1 -1
Index: linux-2.6/arch/powerpc/platforms/powermac/pic.h
===================================================================
@@ -3,7 +3,7 @@
 
 #include <linux/irq.h>
 
-extern struct hw_interrupt_type pmac_pic;
+extern struct irq_chip pmac_pic;
 
 extern void pmac_pic_init(void);
 extern int pmac_get_irq(void);
#23 lore raw

Re: [patch 16/18] powerpc: convert obsolete hw_interrupt_type to struct irq_chip

Quoted 5 lines · Thomas Gleixner

plain text document attachment (powerpc-convert-obsolete-hw-interrupt-type.patch)
Impact: cleanup

Convert the last remaining users to struct irq_chip.

Ack too, same comment, happy to have that one in powerpc.

Ben.

Quoted 35 lines
---
 arch/powerpc/include/asm/hw_irq.h     |    2 +-
 arch/powerpc/platforms/powermac/pic.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/powerpc/include/asm/hw_irq.h
===================================================================

arch/powerpc/include/asm/hw_irq.h +1 -1
@@ -129,7 +129,7 @@ static inline int irqs_disabled_flags(un
  * interrupt-retrigger: should we handle this via lost interrupts and IPIs
  * or should we not care like we do now ? --BenH.
  */
-struct hw_interrupt_type;
+struct irq_chip;
 
 #endif	/* __KERNEL__ */
 #endif	/* _ASM_POWERPC_HW_IRQ_H */

Index: linux-2.6/arch/powerpc/platforms/powermac/pic.h
===================================================================

arch/powerpc/platforms/powermac/pic.h +1 -1
@@ -3,7 +3,7 @@
 
 #include <linux/irq.h>
 
-extern struct hw_interrupt_type pmac_pic;
+extern struct irq_chip pmac_pic;
 
 extern void pmac_pic_init(void);
 extern int pmac_get_irq(void);
#24 lore raw

PATCH 17/18 sh: convert obsolete hw_interrupt_type to struct irq_chip

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_chip.

---
 arch/sh/kernel/cpu/irq/imask.c    |    2 +-
 arch/sh/kernel/cpu/irq/intc-sh5.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/sh/kernel/cpu/irq/imask.c +1 -1
Index: linux-2.6/arch/sh/kernel/cpu/irq/imask.c
===================================================================
@@ -39,7 +39,7 @@ static unsigned int startup_imask_irq(un
 	return 0; /* never anything pending */
 }
 
-static struct hw_interrupt_type imask_irq_type = {
+static struct irq_chip imask_irq_type = {
 	.typename = "SR.IMASK",
 	.startup = startup_imask_irq,
 	.shutdown = shutdown_imask_irq,
arch/sh/kernel/cpu/irq/intc-sh5.c +1 -1
Index: linux-2.6/arch/sh/kernel/cpu/irq/intc-sh5.c
===================================================================
@@ -84,7 +84,7 @@ static void disable_intc_irq(unsigned in
 static void mask_and_ack_intc(unsigned int);
 static void end_intc_irq(unsigned int irq);
 
-static struct hw_interrupt_type intc_irq_type = {
+static struct irq_chip intc_irq_type = {
 	.typename = "INTC",
 	.startup = startup_intc_irq,
 	.shutdown = shutdown_intc_irq,
#25 lore raw

PATCH 18/18 um: convert obsolete hw_interrupt_type to struct irq_chip

In reply to Thomas Gleixner

Impact: cleanup

Convert the last remaining users to struct irq_chip.

---
 arch/um/kernel/irq.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/um/kernel/irq.c +3 -3
Index: linux-2.6/arch/um/kernel/irq.c
===================================================================
@@ -358,7 +358,7 @@ EXPORT_SYMBOL(um_request_irq);
 EXPORT_SYMBOL(reactivate_fd);
 
 /*
- * hw_interrupt_type must define (startup || enable) &&
+ * irq_chip must define (startup || enable) &&
  * (shutdown || disable) && end
  */
 static void dummy(unsigned int irq)
@@ -366,7 +366,7 @@ static void dummy(unsigned int irq)
 }
 
 /* This is used for everything else than the timer. */
-static struct hw_interrupt_type normal_irq_type = {
+static struct irq_chip normal_irq_type = {
 	.typename = "SIGIO",
 	.release = free_irq_by_irq_and_dev,
 	.disable = dummy,
@@ -375,7 +375,7 @@ static struct hw_interrupt_type normal_i
 	.end = dummy
 };
 
-static struct hw_interrupt_type SIGVTALRM_irq_type = {
+static struct irq_chip SIGVTALRM_irq_type = {
 	.typename = "SIGVTALRM",
 	.release = free_irq_by_irq_and_dev,
 	.shutdown = dummy, /* never called */