Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

parisc: remove obsolete hw_interrupt_type

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 <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

authored by

Thomas Gleixner and committed by
Kyle McMartin
dfe07565 47b4150b

+8 -8
+1 -1
arch/parisc/kernel/irq.c
··· 144 144 } 145 145 #endif 146 146 147 - static struct hw_interrupt_type cpu_interrupt_type = { 147 + static struct irq_chip cpu_interrupt_type = { 148 148 .typename = "CPU", 149 149 .startup = cpu_startup_irq, 150 150 .shutdown = cpu_disable_irq,
+1 -1
drivers/parisc/dino.c
··· 353 353 return 0; 354 354 } 355 355 356 - static struct hw_interrupt_type dino_interrupt_type = { 356 + static struct irq_chip dino_interrupt_type = { 357 357 .typename = "GSC-PCI", 358 358 .startup = dino_startup_irq, 359 359 .shutdown = dino_disable_irq,
+1 -1
drivers/parisc/eisa.c
··· 188 188 return 0; 189 189 } 190 190 191 - static struct hw_interrupt_type eisa_interrupt_type = { 191 + static struct irq_chip eisa_interrupt_type = { 192 192 .typename = "EISA", 193 193 .startup = eisa_startup_irq, 194 194 .shutdown = eisa_disable_irq,
+2 -2
drivers/parisc/gsc.c
··· 148 148 return 0; 149 149 } 150 150 151 - static struct hw_interrupt_type gsc_asic_interrupt_type = { 151 + static struct irq_chip gsc_asic_interrupt_type = { 152 152 .typename = "GSC-ASIC", 153 153 .startup = gsc_asic_startup_irq, 154 154 .shutdown = gsc_asic_disable_irq, ··· 158 158 .end = no_end_irq, 159 159 }; 160 160 161 - int gsc_assign_irq(struct hw_interrupt_type *type, void *data) 161 + int gsc_assign_irq(struct irq_chip *type, void *data) 162 162 { 163 163 static int irq = GSC_IRQ_BASE; 164 164 struct irq_desc *desc;
+1 -1
drivers/parisc/gsc.h
··· 38 38 int gsc_common_setup(struct parisc_device *parent, struct gsc_asic *gsc_asic); 39 39 int gsc_alloc_irq(struct gsc_irq *dev); /* dev needs an irq */ 40 40 int gsc_claim_irq(struct gsc_irq *dev, int irq); /* dev needs this irq */ 41 - int gsc_assign_irq(struct hw_interrupt_type *type, void *data); 41 + int gsc_assign_irq(struct irq_chip *type, void *data); 42 42 int gsc_find_local_irq(unsigned int irq, int *global_irq, int limit); 43 43 void gsc_fixup_irqs(struct parisc_device *parent, void *ctrl, 44 44 void (*choose)(struct parisc_device *child, void *ctrl));
+1 -1
drivers/parisc/iosapic.c
··· 729 729 } 730 730 #endif 731 731 732 - static struct hw_interrupt_type iosapic_interrupt_type = { 732 + static struct irq_chip iosapic_interrupt_type = { 733 733 .typename = "IO-SAPIC-level", 734 734 .startup = iosapic_startup_irq, 735 735 .shutdown = iosapic_disable_irq,
+1 -1
drivers/parisc/superio.c
··· 325 325 return 0; 326 326 } 327 327 328 - static struct hw_interrupt_type superio_interrupt_type = { 328 + static struct irq_chip superio_interrupt_type = { 329 329 .typename = SUPERIO, 330 330 .startup = superio_startup_irq, 331 331 .shutdown = superio_disable_irq,