[MIPS] use name instead of typename for each irq_chip

tjh.dev / kernel

fork atom

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

kernel os linux

fork atom

[MIPS] use name instead of typename for each irq_chip

The "typename" field was obsoleted by the "name" field.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Atsushi Nemoto and committed by

Ralf Baechle 19 years ago 70d21cde ea6e942b

+56 -56

32 changed files

expand all collapse all

arch

mips

au1000

common

irq.c

ddb5xxx

ddb5477

irq_5477.c

dec

ioasic-irq.c

kn02-irq.c

emma2rh

common

irq_emma2rh.c

markeins

irq_markeins.c

gt64120

ev64120

irq.c

jazz

irq.c

jmr3927

rbhma3100

irq.c

kernel

irq-msc01.c

irq-mv6434x.c

irq-rm7000.c

irq-rm9000.c

irq_cpu.c

lasat

interrupt.c

mips-boards

atlas

atlas_int.c

momentum

ocelot_c

cpci-irq.c

uart-irq.c

philips

pnx8550

common

int.c

sgi-ip22

ip22-eisa.c

ip22-int.c

sgi-ip27

ip27-irq.c

ip27-timer.c

sgi-ip32

ip32-irq.c

sibyte

bcm1480

irq.c

sb1250

irq.c

sni

irq.c

tx4927

common

tx4927_irq.c

toshiba_rbtx4927

toshiba_rbtx4927_irq.c

tx4938

common

irq.c

toshiba_rbtx4938

irq.c

vr41xx

common

icu.c

+4 -4

arch/mips/au1000/common/irq.c

reviewed

··· 233 233 234 234 235 235 static struct irq_chip rise_edge_irq_type = { 236 236 - .typename = "Au1000 Rise Edge", 236 236 + .name = "Au1000 Rise Edge", 237 237 .ack = mask_and_ack_rise_edge_irq, 238 238 .mask = local_disable_irq, 239 239 .mask_ack = mask_and_ack_rise_edge_irq, ··· 242 242 }; 243 243 244 244 static struct irq_chip fall_edge_irq_type = { 245 245 - .typename = "Au1000 Fall Edge", 245 245 + .name = "Au1000 Fall Edge", 246 246 .ack = mask_and_ack_fall_edge_irq, 247 247 .mask = local_disable_irq, 248 248 .mask_ack = mask_and_ack_fall_edge_irq, ··· 251 251 }; 252 252 253 253 static struct irq_chip either_edge_irq_type = { 254 254 - .typename = "Au1000 Rise or Fall Edge", 254 254 + .name = "Au1000 Rise or Fall Edge", 255 255 .ack = mask_and_ack_either_edge_irq, 256 256 .mask = local_disable_irq, 257 257 .mask_ack = mask_and_ack_either_edge_irq, ··· 260 260 }; 261 261 262 262 static struct irq_chip level_irq_type = { 263 263 - .typename = "Au1000 Level", 263 263 + .name = "Au1000 Level", 264 264 .ack = mask_and_ack_level_irq, 265 265 .mask = local_disable_irq, 266 266 .mask_ack = mask_and_ack_level_irq,

+1 -1

arch/mips/ddb5xxx/ddb5477/irq_5477.c

reviewed

··· 82 82 } 83 83 84 84 struct irq_chip vrc5477_irq_controller = { 85 85 - .typename = "vrc5477_irq", 85 85 + .name = "vrc5477_irq", 86 86 .ack = vrc5477_irq_ack, 87 87 .mask = vrc5477_irq_disable, 88 88 .mask_ack = vrc5477_irq_ack,

+2 -2

arch/mips/dec/ioasic-irq.c

reviewed

··· 62 62 } 63 63 64 64 static struct irq_chip ioasic_irq_type = { 65 65 - .typename = "IO-ASIC", 65 65 + .name = "IO-ASIC", 66 66 .ack = ack_ioasic_irq, 67 67 .mask = mask_ioasic_irq, 68 68 .mask_ack = ack_ioasic_irq, ··· 84 84 } 85 85 86 86 static struct irq_chip ioasic_dma_irq_type = { 87 87 - .typename = "IO-ASIC-DMA", 87 87 + .name = "IO-ASIC-DMA", 88 88 .ack = ack_ioasic_dma_irq, 89 89 .mask = mask_ioasic_dma_irq, 90 90 .mask_ack = ack_ioasic_dma_irq,

+1 -1

arch/mips/dec/kn02-irq.c

reviewed

··· 58 58 } 59 59 60 60 static struct irq_chip kn02_irq_type = { 61 61 - .typename = "KN02-CSR", 61 61 + .name = "KN02-CSR", 62 62 .ack = ack_kn02_irq, 63 63 .mask = mask_kn02_irq, 64 64 .mask_ack = ack_kn02_irq,

+1 -1

arch/mips/emma2rh/common/irq_emma2rh.c

reviewed

··· 57 57 } 58 58 59 59 struct irq_chip emma2rh_irq_controller = { 60 60 - .typename = "emma2rh_irq", 60 60 + .name = "emma2rh_irq", 61 61 .ack = emma2rh_irq_disable, 62 62 .mask = emma2rh_irq_disable, 63 63 .mask_ack = emma2rh_irq_disable,

+2 -2

arch/mips/emma2rh/markeins/irq_markeins.c

reviewed

··· 49 49 } 50 50 51 51 struct irq_chip emma2rh_sw_irq_controller = { 52 52 - .typename = "emma2rh_sw_irq", 52 52 + .name = "emma2rh_sw_irq", 53 53 .ack = emma2rh_sw_irq_disable, 54 54 .mask = emma2rh_sw_irq_disable, 55 55 .mask_ack = emma2rh_sw_irq_disable, ··· 115 115 } 116 116 117 117 struct irq_chip emma2rh_gpio_irq_controller = { 118 118 - .typename = "emma2rh_gpio_irq", 118 118 + .name = "emma2rh_gpio_irq", 119 119 .ack = emma2rh_gpio_irq_ack, 120 120 .mask = emma2rh_gpio_irq_disable, 121 121 .mask_ack = emma2rh_gpio_irq_ack,

+1 -1

arch/mips/gt64120/ev64120/irq.c

reviewed

··· 88 88 } 89 89 90 90 static struct irq_chip ev64120_irq_type = { 91 91 - .typename = "EV64120", 91 91 + .name = "EV64120", 92 92 .ack = disable_ev64120_irq, 93 93 .mask = disable_ev64120_irq, 94 94 .mask_ack = disable_ev64120_irq,

+1 -1

arch/mips/jazz/irq.c

reviewed

··· 40 40 } 41 41 42 42 static struct irq_chip r4030_irq_type = { 43 43 - .typename = "R4030", 43 43 + .name = "R4030", 44 44 .ack = disable_r4030_irq, 45 45 .mask = disable_r4030_irq, 46 46 .mask_ack = disable_r4030_irq,

+1 -1

arch/mips/jmr3927/rbhma3100/irq.c

reviewed

··· 439 439 } 440 440 441 441 static struct irq_chip jmr3927_irq_controller = { 442 442 - .typename = "jmr3927_irq", 442 442 + .name = "jmr3927_irq", 443 443 .ack = jmr3927_irq_ack, 444 444 .mask = jmr3927_irq_disable, 445 445 .mask_ack = jmr3927_irq_ack,

+2 -2

arch/mips/kernel/irq-msc01.c

reviewed

··· 112 112 } 113 113 114 114 struct irq_chip msc_levelirq_type = { 115 115 - .typename = "SOC-it-Level", 115 115 + .name = "SOC-it-Level", 116 116 .ack = level_mask_and_ack_msc_irq, 117 117 .mask = mask_msc_irq, 118 118 .mask_ack = level_mask_and_ack_msc_irq, ··· 122 122 }; 123 123 124 124 struct irq_chip msc_edgeirq_type = { 125 125 - .typename = "SOC-it-Edge", 125 125 + .name = "SOC-it-Edge", 126 126 .ack = edge_mask_and_ack_msc_irq, 127 127 .mask = mask_msc_irq, 128 128 .mask_ack = edge_mask_and_ack_msc_irq,

+1 -1

arch/mips/kernel/irq-mv6434x.c

reviewed

··· 92 92 } 93 93 94 94 struct irq_chip mv64340_irq_type = { 95 95 - .typename = "MV-64340", 95 95 + .name = "MV-64340", 96 96 .ack = mask_mv64340_irq, 97 97 .mask = mask_mv64340_irq, 98 98 .mask_ack = mask_mv64340_irq,

+1 -1

arch/mips/kernel/irq-rm7000.c

reviewed

··· 28 28 } 29 29 30 30 static struct irq_chip rm7k_irq_controller = { 31 31 - .typename = "RM7000", 31 31 + .name = "RM7000", 32 32 .ack = mask_rm7k_irq, 33 33 .mask = mask_rm7k_irq, 34 34 .mask_ack = mask_rm7k_irq,

+2 -2

arch/mips/kernel/irq-rm9000.c

reviewed

··· 70 70 } 71 71 72 72 static struct irq_chip rm9k_irq_controller = { 73 73 - .typename = "RM9000", 73 73 + .name = "RM9000", 74 74 .ack = mask_rm9k_irq, 75 75 .mask = mask_rm9k_irq, 76 76 .mask_ack = mask_rm9k_irq, ··· 78 78 }; 79 79 80 80 static struct irq_chip rm9k_perfcounter_irq = { 81 81 - .typename = "RM9000", 81 81 + .name = "RM9000", 82 82 .startup = rm9k_perfcounter_irq_startup, 83 83 .shutdown = rm9k_perfcounter_irq_shutdown, 84 84 .ack = mask_rm9k_irq,

+2 -2

arch/mips/kernel/irq_cpu.c

reviewed

··· 49 49 } 50 50 51 51 static struct irq_chip mips_cpu_irq_controller = { 52 52 - .typename = "MIPS", 52 52 + .name = "MIPS", 53 53 .ack = mask_mips_irq, 54 54 .mask = mask_mips_irq, 55 55 .mask_ack = mask_mips_irq, ··· 88 88 } 89 89 90 90 static struct irq_chip mips_mt_cpu_irq_controller = { 91 91 - .typename = "MIPS", 91 91 + .name = "MIPS", 92 92 .startup = mips_mt_cpu_irq_startup, 93 93 .ack = mips_mt_cpu_irq_ack, 94 94 .mask = mask_mips_mt_irq,

+1 -1

arch/mips/lasat/interrupt.c

reviewed

··· 45 45 } 46 46 47 47 static struct irq_chip lasat_irq_type = { 48 48 - .typename = "Lasat", 48 48 + .name = "Lasat", 49 49 .ack = disable_lasat_irq, 50 50 .mask = disable_lasat_irq, 51 51 .mask_ack = disable_lasat_irq,

+1 -1

arch/mips/mips-boards/atlas/atlas_int.c

reviewed

··· 69 69 } 70 70 71 71 static struct irq_chip atlas_irq_type = { 72 72 - .typename = "Atlas", 72 72 + .name = "Atlas", 73 73 .ack = disable_atlas_irq, 74 74 .mask = disable_atlas_irq, 75 75 .mask_ack = disable_atlas_irq,

+1 -1

arch/mips/momentum/ocelot_c/cpci-irq.c

reviewed

··· 84 84 } 85 85 86 86 struct irq_chip cpci_irq_type = { 87 87 - .typename = "CPCI/FPGA", 87 87 + .name = "CPCI/FPGA", 88 88 .ack = mask_cpci_irq, 89 89 .mask = mask_cpci_irq, 90 90 .mask_ack = mask_cpci_irq,

+1 -1

arch/mips/momentum/ocelot_c/uart-irq.c

reviewed

··· 77 77 } 78 78 79 79 struct irq_chip uart_irq_type = { 80 80 - .typename = "UART/FPGA", 80 80 + .name = "UART/FPGA", 81 81 .ack = mask_uart_irq, 82 82 .mask = mask_uart_irq, 83 83 .mask_ack = mask_uart_irq,

+1 -1

arch/mips/philips/pnx8550/common/int.c

reviewed

··· 159 159 } 160 160 161 161 static struct irq_chip level_irq_type = { 162 162 - .typename = "PNX Level IRQ", 162 162 + .name = "PNX Level IRQ", 163 163 .ack = mask_irq, 164 164 .mask = mask_irq, 165 165 .mask_ack = mask_irq,

+2 -2

arch/mips/sgi-ip22/ip22-eisa.c

reviewed

··· 139 139 } 140 140 141 141 static struct irq_chip ip22_eisa1_irq_type = { 142 142 - .typename = "IP22 EISA", 142 142 + .name = "IP22 EISA", 143 143 .startup = startup_eisa1_irq, 144 144 .ack = mask_and_ack_eisa1_irq, 145 145 .mask = disable_eisa1_irq, ··· 194 194 } 195 195 196 196 static struct irq_chip ip22_eisa2_irq_type = { 197 197 - .typename = "IP22 EISA", 197 197 + .name = "IP22 EISA", 198 198 .startup = startup_eisa2_irq, 199 199 .ack = mask_and_ack_eisa2_irq, 200 200 .mask = disable_eisa2_irq,

+4 -4

arch/mips/sgi-ip22/ip22-int.c

reviewed

··· 53 53 } 54 54 55 55 static struct irq_chip ip22_local0_irq_type = { 56 56 - .typename = "IP22 local 0", 56 56 + .name = "IP22 local 0", 57 57 .ack = disable_local0_irq, 58 58 .mask = disable_local0_irq, 59 59 .mask_ack = disable_local0_irq, ··· 74 74 } 75 75 76 76 static struct irq_chip ip22_local1_irq_type = { 77 77 - .typename = "IP22 local 1", 77 77 + .name = "IP22 local 1", 78 78 .ack = disable_local1_irq, 79 79 .mask = disable_local1_irq, 80 80 .mask_ack = disable_local1_irq, ··· 95 95 } 96 96 97 97 static struct irq_chip ip22_local2_irq_type = { 98 98 - .typename = "IP22 local 2", 98 98 + .name = "IP22 local 2", 99 99 .ack = disable_local2_irq, 100 100 .mask = disable_local2_irq, 101 101 .mask_ack = disable_local2_irq, ··· 116 116 } 117 117 118 118 static struct irq_chip ip22_local3_irq_type = { 119 119 - .typename = "IP22 local 3", 119 119 + .name = "IP22 local 3", 120 120 .ack = disable_local3_irq, 121 121 .mask = disable_local3_irq, 122 122 .mask_ack = disable_local3_irq,

+1 -1

arch/mips/sgi-ip27/ip27-irq.c

reviewed

··· 333 333 } 334 334 335 335 static struct irq_chip bridge_irq_type = { 336 336 - .typename = "bridge", 336 336 + .name = "bridge", 337 337 .startup = startup_bridge_irq, 338 338 .shutdown = shutdown_bridge_irq, 339 339 .ack = disable_bridge_irq,

+1 -1

arch/mips/sgi-ip27/ip27-timer.c

reviewed

··· 181 181 } 182 182 183 183 static struct irq_chip rt_irq_type = { 184 184 - .typename = "SN HUB RT timer", 184 184 + .name = "SN HUB RT timer", 185 185 .ack = disable_rt_irq, 186 186 .mask = disable_rt_irq, 187 187 .mask_ack = disable_rt_irq,

+5 -5

arch/mips/sgi-ip32/ip32-irq.c

reviewed

··· 144 144 } 145 145 146 146 static struct irq_chip ip32_cpu_interrupt = { 147 147 - .typename = "IP32 CPU", 147 147 + .name = "IP32 CPU", 148 148 .ack = disable_cpu_irq, 149 149 .mask = disable_cpu_irq, 150 150 .mask_ack = disable_cpu_irq, ··· 193 193 } 194 194 195 195 static struct irq_chip ip32_crime_interrupt = { 196 196 - .typename = "IP32 CRIME", 196 196 + .name = "IP32 CRIME", 197 197 .ack = mask_and_ack_crime_irq, 198 198 .mask = disable_crime_irq, 199 199 .mask_ack = mask_and_ack_crime_irq, ··· 234 234 } 235 235 236 236 static struct irq_chip ip32_macepci_interrupt = { 237 237 - .typename = "IP32 MACE PCI", 237 237 + .name = "IP32 MACE PCI", 238 238 .ack = disable_macepci_irq, 239 239 .mask = disable_macepci_irq, 240 240 .mask_ack = disable_macepci_irq, ··· 347 347 } 348 348 349 349 static struct irq_chip ip32_maceisa_interrupt = { 350 350 - .typename = "IP32 MACE ISA", 350 350 + .name = "IP32 MACE ISA", 351 351 .ack = mask_and_ack_maceisa_irq, 352 352 .mask = disable_maceisa_irq, 353 353 .mask_ack = mask_and_ack_maceisa_irq, ··· 379 379 } 380 380 381 381 static struct irq_chip ip32_mace_interrupt = { 382 382 - .typename = "IP32 MACE", 382 382 + .name = "IP32 MACE", 383 383 .ack = disable_mace_irq, 384 384 .mask = disable_mace_irq, 385 385 .mask_ack = disable_mace_irq,

+1 -1

arch/mips/sibyte/bcm1480/irq.c

reviewed

··· 82 82 #endif 83 83 84 84 static struct irq_chip bcm1480_irq_type = { 85 85 - .typename = "BCM1480-IMR", 85 85 + .name = "BCM1480-IMR", 86 86 .ack = ack_bcm1480_irq, 87 87 .mask = disable_bcm1480_irq, 88 88 .mask_ack = ack_bcm1480_irq,

+1 -1

arch/mips/sibyte/sb1250/irq.c

reviewed

··· 67 67 #endif 68 68 69 69 static struct irq_chip sb1250_irq_type = { 70 70 - .typename = "SB1250-IMR", 70 70 + .name = "SB1250-IMR", 71 71 .ack = ack_sb1250_irq, 72 72 .mask = disable_sb1250_irq, 73 73 .mask_ack = ack_sb1250_irq,

+1 -1

arch/mips/sni/irq.c

reviewed

··· 37 37 } 38 38 39 39 static struct irq_chip pciasic_irq_type = { 40 40 - .typename = "ASIC-PCI", 40 40 + .name = "ASIC-PCI", 41 41 .ack = disable_pciasic_irq, 42 42 .mask = disable_pciasic_irq, 43 43 .mask_ack = disable_pciasic_irq,

+2 -2

arch/mips/tx4927/common/tx4927_irq.c

reviewed

··· 120 120 121 121 #define TX4927_CP0_NAME "TX4927-CP0" 122 122 static struct irq_chip tx4927_irq_cp0_type = { 123 123 - .typename = TX4927_CP0_NAME, 123 123 + .name = TX4927_CP0_NAME, 124 124 .ack = tx4927_irq_cp0_disable, 125 125 .mask = tx4927_irq_cp0_disable, 126 126 .mask_ack = tx4927_irq_cp0_disable, ··· 129 129 130 130 #define TX4927_PIC_NAME "TX4927-PIC" 131 131 static struct irq_chip tx4927_irq_pic_type = { 132 132 - .typename = TX4927_PIC_NAME, 132 132 + .name = TX4927_PIC_NAME, 133 133 .ack = tx4927_irq_pic_disable, 134 134 .mask = tx4927_irq_pic_disable, 135 135 .mask_ack = tx4927_irq_pic_disable,

+6 -6

arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c

reviewed

··· 228 228 229 229 #define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC" 230 230 static struct irq_chip toshiba_rbtx4927_irq_ioc_type = { 231 231 - .typename = TOSHIBA_RBTX4927_IOC_NAME, 231 231 + .name = TOSHIBA_RBTX4927_IOC_NAME, 232 232 .ack = toshiba_rbtx4927_irq_ioc_disable, 233 233 .mask = toshiba_rbtx4927_irq_ioc_disable, 234 234 .mask_ack = toshiba_rbtx4927_irq_ioc_disable, ··· 241 241 #ifdef CONFIG_TOSHIBA_FPCIB0 242 242 #define TOSHIBA_RBTX4927_ISA_NAME "RBTX4927-ISA" 243 243 static struct irq_chip toshiba_rbtx4927_irq_isa_type = { 244 244 - .typename = TOSHIBA_RBTX4927_ISA_NAME, 244 244 + .name = TOSHIBA_RBTX4927_ISA_NAME, 245 245 .ack = toshiba_rbtx4927_irq_isa_mask_and_ack, 246 246 .mask = toshiba_rbtx4927_irq_isa_disable, 247 247 .mask_ack = toshiba_rbtx4927_irq_isa_mask_and_ack, ··· 490 490 { 491 491 u32 i, j = 0; 492 492 for (i = 0; i < NR_IRQS; i++) { 493 493 - if (strcmp(irq_desc[i].chip->typename, "none") 493 493 + if (strcmp(irq_desc[i].chip->name, "none") 494 494 == 0) 495 495 continue; 496 496 497 497 if ((i >= 1) 498 498 - && (irq_desc[i - 1].chip->typename == 499 499 - irq_desc[i].chip->typename)) { 498 498 + && (irq_desc[i - 1].chip->name == 499 499 + irq_desc[i].chip->name)) { 500 500 j++; 501 501 } else { 502 502 j = 0; ··· 510 510 (u32) (irq_desc[i].action ? irq_desc[i]. 511 511 action->handler : 0), 512 512 irq_desc[i].depth, 513 513 - irq_desc[i].chip->typename, j); 513 513 + irq_desc[i].chip->name, j); 514 514 } 515 515 } 516 516 #endif

+2 -2

arch/mips/tx4938/common/irq.c

reviewed

··· 49 49 50 50 #define TX4938_CP0_NAME "TX4938-CP0" 51 51 static struct irq_chip tx4938_irq_cp0_type = { 52 52 - .typename = TX4938_CP0_NAME, 52 52 + .name = TX4938_CP0_NAME, 53 53 .ack = tx4938_irq_cp0_disable, 54 54 .mask = tx4938_irq_cp0_disable, 55 55 .mask_ack = tx4938_irq_cp0_disable, ··· 58 58 59 59 #define TX4938_PIC_NAME "TX4938-PIC" 60 60 static struct irq_chip tx4938_irq_pic_type = { 61 61 - .typename = TX4938_PIC_NAME, 61 61 + .name = TX4938_PIC_NAME, 62 62 .ack = tx4938_irq_pic_disable, 63 63 .mask = tx4938_irq_pic_disable, 64 64 .mask_ack = tx4938_irq_pic_disable,

+1 -1

arch/mips/tx4938/toshiba_rbtx4938/irq.c

reviewed

··· 92 92 93 93 #define TOSHIBA_RBTX4938_IOC_NAME "RBTX4938-IOC" 94 94 static struct irq_chip toshiba_rbtx4938_irq_ioc_type = { 95 95 - .typename = TOSHIBA_RBTX4938_IOC_NAME, 95 95 + .name = TOSHIBA_RBTX4938_IOC_NAME, 96 96 .ack = toshiba_rbtx4938_irq_ioc_disable, 97 97 .mask = toshiba_rbtx4938_irq_ioc_disable, 98 98 .mask_ack = toshiba_rbtx4938_irq_ioc_disable,

+2 -2

arch/mips/vr41xx/common/icu.c

reviewed

··· 453 453 } 454 454 455 455 static struct irq_chip sysint1_irq_type = { 456 456 - .typename = "SYSINT1", 456 456 + .name = "SYSINT1", 457 457 .ack = disable_sysint1_irq, 458 458 .mask = disable_sysint1_irq, 459 459 .mask_ack = disable_sysint1_irq, ··· 471 471 } 472 472 473 473 static struct irq_chip sysint2_irq_type = { 474 474 - .typename = "SYSINT2", 474 474 + .name = "SYSINT2", 475 475 .ack = disable_sysint2_irq, 476 476 .mask = disable_sysint2_irq, 477 477 .mask_ack = disable_sysint2_irq,