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

alpha: 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>
Cc: Richard Henderson <rth@twiddle.net>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Thomas Gleixner and committed by
Linus Torvalds
44377f62 ee993b13

+27 -27
+1 -1
arch/alpha/kernel/irq_alpha.c
··· 227 227 .name = "timer", 228 228 }; 229 229 230 - static struct hw_interrupt_type rtc_irq_type = { 230 + static struct irq_chip rtc_irq_type = { 231 231 .typename = "RTC", 232 232 .startup = rtc_startup, 233 233 .shutdown = rtc_enable_disable,
+1 -1
arch/alpha/kernel/irq_i8259.c
··· 83 83 i8259a_enable_irq(irq); 84 84 } 85 85 86 - struct hw_interrupt_type i8259a_irq_type = { 86 + struct irq_chip i8259a_irq_type = { 87 87 .typename = "XT-PIC", 88 88 .startup = i8259a_startup_irq, 89 89 .shutdown = i8259a_disable_irq,
+1 -1
arch/alpha/kernel/irq_impl.h
··· 36 36 extern void i8259a_mask_and_ack_irq(unsigned int); 37 37 extern unsigned int i8259a_startup_irq(unsigned int); 38 38 extern void i8259a_end_irq(unsigned int); 39 - extern struct hw_interrupt_type i8259a_irq_type; 39 + extern struct irq_chip i8259a_irq_type; 40 40 extern void init_i8259a_irqs(void); 41 41 42 42 extern void handle_irq(int irq);
+1 -1
arch/alpha/kernel/irq_pyxis.c
··· 70 70 *(vulp)PYXIS_INT_MASK; 71 71 } 72 72 73 - static struct hw_interrupt_type pyxis_irq_type = { 73 + static struct irq_chip pyxis_irq_type = { 74 74 .typename = "PYXIS", 75 75 .startup = pyxis_startup_irq, 76 76 .shutdown = pyxis_disable_irq,
+1 -1
arch/alpha/kernel/irq_srm.c
··· 48 48 } 49 49 50 50 /* Handle interrupts from the SRM, assuming no additional weirdness. */ 51 - static struct hw_interrupt_type srm_irq_type = { 51 + static struct irq_chip srm_irq_type = { 52 52 .typename = "SRM", 53 53 .startup = srm_startup_irq, 54 54 .shutdown = srm_disable_irq,
+1 -1
arch/alpha/kernel/sys_alcor.c
··· 89 89 alcor_enable_irq(irq); 90 90 } 91 91 92 - static struct hw_interrupt_type alcor_irq_type = { 92 + static struct irq_chip alcor_irq_type = { 93 93 .typename = "ALCOR", 94 94 .startup = alcor_startup_irq, 95 95 .shutdown = alcor_disable_irq,
+1 -1
arch/alpha/kernel/sys_cabriolet.c
··· 71 71 cabriolet_enable_irq(irq); 72 72 } 73 73 74 - static struct hw_interrupt_type cabriolet_irq_type = { 74 + static struct irq_chip cabriolet_irq_type = { 75 75 .typename = "CABRIOLET", 76 76 .startup = cabriolet_startup_irq, 77 77 .shutdown = cabriolet_disable_irq,
+3 -3
arch/alpha/kernel/sys_dp264.c
··· 198 198 return 0; 199 199 } 200 200 201 - static struct hw_interrupt_type dp264_irq_type = { 201 + static struct irq_chip dp264_irq_type = { 202 202 .typename = "DP264", 203 203 .startup = dp264_startup_irq, 204 204 .shutdown = dp264_disable_irq, ··· 209 209 .set_affinity = dp264_set_affinity, 210 210 }; 211 211 212 - static struct hw_interrupt_type clipper_irq_type = { 212 + static struct irq_chip clipper_irq_type = { 213 213 .typename = "CLIPPER", 214 214 .startup = clipper_startup_irq, 215 215 .shutdown = clipper_disable_irq, ··· 298 298 } 299 299 300 300 static void __init 301 - init_tsunami_irqs(struct hw_interrupt_type * ops, int imin, int imax) 301 + init_tsunami_irqs(struct irq_chip * ops, int imin, int imax) 302 302 { 303 303 long i; 304 304 for (i = imin; i <= imax; ++i) {
+1 -1
arch/alpha/kernel/sys_eb64p.c
··· 69 69 eb64p_enable_irq(irq); 70 70 } 71 71 72 - static struct hw_interrupt_type eb64p_irq_type = { 72 + static struct irq_chip eb64p_irq_type = { 73 73 .typename = "EB64P", 74 74 .startup = eb64p_startup_irq, 75 75 .shutdown = eb64p_disable_irq,
+1 -1
arch/alpha/kernel/sys_eiger.c
··· 80 80 eiger_enable_irq(irq); 81 81 } 82 82 83 - static struct hw_interrupt_type eiger_irq_type = { 83 + static struct irq_chip eiger_irq_type = { 84 84 .typename = "EIGER", 85 85 .startup = eiger_startup_irq, 86 86 .shutdown = eiger_disable_irq,
+1 -1
arch/alpha/kernel/sys_jensen.c
··· 118 118 i8259a_end_irq(1); 119 119 } 120 120 121 - static struct hw_interrupt_type jensen_local_irq_type = { 121 + static struct irq_chip jensen_local_irq_type = { 122 122 .typename = "LOCAL", 123 123 .startup = jensen_local_startup, 124 124 .shutdown = jensen_local_shutdown,
+5 -5
arch/alpha/kernel/sys_marvel.c
··· 169 169 return 0; 170 170 } 171 171 172 - static struct hw_interrupt_type marvel_legacy_irq_type = { 172 + static struct irq_chip marvel_legacy_irq_type = { 173 173 .typename = "LEGACY", 174 174 .startup = marvel_irq_noop_return, 175 175 .shutdown = marvel_irq_noop, ··· 179 179 .end = marvel_irq_noop, 180 180 }; 181 181 182 - static struct hw_interrupt_type io7_lsi_irq_type = { 182 + static struct irq_chip io7_lsi_irq_type = { 183 183 .typename = "LSI", 184 184 .startup = io7_startup_irq, 185 185 .shutdown = io7_disable_irq, ··· 189 189 .end = io7_end_irq, 190 190 }; 191 191 192 - static struct hw_interrupt_type io7_msi_irq_type = { 192 + static struct irq_chip io7_msi_irq_type = { 193 193 .typename = "MSI", 194 194 .startup = io7_startup_irq, 195 195 .shutdown = io7_disable_irq, ··· 273 273 274 274 static void __init 275 275 init_io7_irqs(struct io7 *io7, 276 - struct hw_interrupt_type *lsi_ops, 277 - struct hw_interrupt_type *msi_ops) 276 + struct irq_chip *lsi_ops, 277 + struct irq_chip *msi_ops) 278 278 { 279 279 long base = (io7->pe << MARVEL_IRQ_VEC_PE_SHIFT) + 16; 280 280 long i;
+1 -1
arch/alpha/kernel/sys_mikasa.c
··· 68 68 mikasa_enable_irq(irq); 69 69 } 70 70 71 - static struct hw_interrupt_type mikasa_irq_type = { 71 + static struct irq_chip mikasa_irq_type = { 72 72 .typename = "MIKASA", 73 73 .startup = mikasa_startup_irq, 74 74 .shutdown = mikasa_disable_irq,
+1 -1
arch/alpha/kernel/sys_noritake.c
··· 73 73 noritake_enable_irq(irq); 74 74 } 75 75 76 - static struct hw_interrupt_type noritake_irq_type = { 76 + static struct irq_chip noritake_irq_type = { 77 77 .typename = "NORITAKE", 78 78 .startup = noritake_startup_irq, 79 79 .shutdown = noritake_disable_irq,
+1 -1
arch/alpha/kernel/sys_rawhide.c
··· 135 135 rawhide_enable_irq(irq); 136 136 } 137 137 138 - static struct hw_interrupt_type rawhide_irq_type = { 138 + static struct irq_chip rawhide_irq_type = { 139 139 .typename = "RAWHIDE", 140 140 .startup = rawhide_startup_irq, 141 141 .shutdown = rawhide_disable_irq,
+1 -1
arch/alpha/kernel/sys_rx164.c
··· 72 72 rx164_enable_irq(irq); 73 73 } 74 74 75 - static struct hw_interrupt_type rx164_irq_type = { 75 + static struct irq_chip rx164_irq_type = { 76 76 .typename = "RX164", 77 77 .startup = rx164_startup_irq, 78 78 .shutdown = rx164_disable_irq,
+1 -1
arch/alpha/kernel/sys_sable.c
··· 501 501 spin_unlock(&sable_lynx_irq_lock); 502 502 } 503 503 504 - static struct hw_interrupt_type sable_lynx_irq_type = { 504 + static struct irq_chip sable_lynx_irq_type = { 505 505 .typename = "SABLE/LYNX", 506 506 .startup = sable_lynx_startup_irq, 507 507 .shutdown = sable_lynx_disable_irq,
+1 -1
arch/alpha/kernel/sys_takara.c
··· 74 74 takara_enable_irq(irq); 75 75 } 76 76 77 - static struct hw_interrupt_type takara_irq_type = { 77 + static struct irq_chip takara_irq_type = { 78 78 .typename = "TAKARA", 79 79 .startup = takara_startup_irq, 80 80 .shutdown = takara_disable_irq,
+2 -2
arch/alpha/kernel/sys_titan.c
··· 185 185 186 186 187 187 static void __init 188 - init_titan_irqs(struct hw_interrupt_type * ops, int imin, int imax) 188 + init_titan_irqs(struct irq_chip * ops, int imin, int imax) 189 189 { 190 190 long i; 191 191 for (i = imin; i <= imax; ++i) { ··· 194 194 } 195 195 } 196 196 197 - static struct hw_interrupt_type titan_irq_type = { 197 + static struct irq_chip titan_irq_type = { 198 198 .typename = "TITAN", 199 199 .startup = titan_startup_irq, 200 200 .shutdown = titan_disable_irq,
+1 -1
arch/alpha/kernel/sys_wildfire.c
··· 157 157 wildfire_enable_irq(irq); 158 158 } 159 159 160 - static struct hw_interrupt_type wildfire_irq_type = { 160 + static struct irq_chip wildfire_irq_type = { 161 161 .typename = "WILDFIRE", 162 162 .startup = wildfire_startup_irq, 163 163 .shutdown = wildfire_disable_irq,