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

genirq: Cleanup irq_chip->typename leftovers

3 years transition phase is enough. Cleanup the last users and remove
the cruft.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Leo Chen <leochen@broadcom.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Chris Zankel <chris@zankel.net>

+24 -32
+3 -3
arch/arm/mach-bcmring/irq.c
··· 67 67 } 68 68 69 69 static struct irq_chip bcmring_irq0_chip = { 70 - .typename = "ARM-INTC0", 70 + .name = "ARM-INTC0", 71 71 .ack = bcmring_mask_irq0, 72 72 .mask = bcmring_mask_irq0, /* mask a specific interrupt, blocking its delivery. */ 73 73 .unmask = bcmring_unmask_irq0, /* unmaks an interrupt */ 74 74 }; 75 75 76 76 static struct irq_chip bcmring_irq1_chip = { 77 - .typename = "ARM-INTC1", 77 + .name = "ARM-INTC1", 78 78 .ack = bcmring_mask_irq1, 79 79 .mask = bcmring_mask_irq1, 80 80 .unmask = bcmring_unmask_irq1, 81 81 }; 82 82 83 83 static struct irq_chip bcmring_irq2_chip = { 84 - .typename = "ARM-SINTC", 84 + .name = "ARM-SINTC", 85 85 .ack = bcmring_mask_irq2, 86 86 .mask = bcmring_mask_irq2, 87 87 .unmask = bcmring_unmask_irq2,
+1 -1
arch/m32r/kernel/irq.c
··· 51 51 for_each_online_cpu(j) 52 52 seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); 53 53 #endif 54 - seq_printf(p, " %14s", irq_desc[i].chip->typename); 54 + seq_printf(p, " %14s", irq_desc[i].chip->name); 55 55 seq_printf(p, " %s", action->name); 56 56 57 57 for (action=action->next; action; action = action->next)
+1 -1
arch/m32r/platforms/m32104ut/setup.c
··· 65 65 66 66 static struct irq_chip m32104ut_irq_type = 67 67 { 68 - .typename = "M32104UT-IRQ", 68 + .name = "M32104UT-IRQ", 69 69 .startup = startup_m32104ut_irq, 70 70 .shutdown = shutdown_m32104ut_irq, 71 71 .enable = enable_m32104ut_irq,
+4 -4
arch/m32r/platforms/m32700ut/setup.c
··· 71 71 72 72 static struct irq_chip m32700ut_irq_type = 73 73 { 74 - .typename = "M32700UT-IRQ", 74 + .name = "M32700UT-IRQ", 75 75 .startup = startup_m32700ut_irq, 76 76 .shutdown = shutdown_m32700ut_irq, 77 77 .enable = enable_m32700ut_irq, ··· 148 148 149 149 static struct irq_chip m32700ut_pld_irq_type = 150 150 { 151 - .typename = "M32700UT-PLD-IRQ", 151 + .name = "M32700UT-PLD-IRQ", 152 152 .startup = startup_m32700ut_pld_irq, 153 153 .shutdown = shutdown_m32700ut_pld_irq, 154 154 .enable = enable_m32700ut_pld_irq, ··· 217 217 218 218 static struct irq_chip m32700ut_lanpld_irq_type = 219 219 { 220 - .typename = "M32700UT-PLD-LAN-IRQ", 220 + .name = "M32700UT-PLD-LAN-IRQ", 221 221 .startup = startup_m32700ut_lanpld_irq, 222 222 .shutdown = shutdown_m32700ut_lanpld_irq, 223 223 .enable = enable_m32700ut_lanpld_irq, ··· 286 286 287 287 static struct irq_chip m32700ut_lcdpld_irq_type = 288 288 { 289 - .typename = "M32700UT-PLD-LCD-IRQ", 289 + .name = "M32700UT-PLD-LCD-IRQ", 290 290 .startup = startup_m32700ut_lcdpld_irq, 291 291 .shutdown = shutdown_m32700ut_lcdpld_irq, 292 292 .enable = enable_m32700ut_lcdpld_irq,
+1 -1
arch/m32r/platforms/mappi/setup.c
··· 65 65 66 66 static struct irq_chip mappi_irq_type = 67 67 { 68 - .typename = "MAPPI-IRQ", 68 + .name = "MAPPI-IRQ", 69 69 .startup = startup_mappi_irq, 70 70 .shutdown = shutdown_mappi_irq, 71 71 .enable = enable_mappi_irq,
+1 -1
arch/m32r/platforms/mappi2/setup.c
··· 72 72 73 73 static struct irq_chip mappi2_irq_type = 74 74 { 75 - .typename = "MAPPI2-IRQ", 75 + .name = "MAPPI2-IRQ", 76 76 .startup = startup_mappi2_irq, 77 77 .shutdown = shutdown_mappi2_irq, 78 78 .enable = enable_mappi2_irq,
+1 -1
arch/m32r/platforms/mappi3/setup.c
··· 72 72 73 73 static struct irq_chip mappi3_irq_type = 74 74 { 75 - .typename = "MAPPI3-IRQ", 75 + .name = "MAPPI3-IRQ", 76 76 .startup = startup_mappi3_irq, 77 77 .shutdown = shutdown_mappi3_irq, 78 78 .enable = enable_mappi3_irq,
+1 -1
arch/m32r/platforms/oaks32r/setup.c
··· 63 63 64 64 static struct irq_chip oaks32r_irq_type = 65 65 { 66 - .typename = "OAKS32R-IRQ", 66 + .name = "OAKS32R-IRQ", 67 67 .startup = startup_oaks32r_irq, 68 68 .shutdown = shutdown_oaks32r_irq, 69 69 .enable = enable_oaks32r_irq,
+3 -3
arch/m32r/platforms/opsput/setup.c
··· 72 72 73 73 static struct irq_chip opsput_irq_type = 74 74 { 75 - .typename = "OPSPUT-IRQ", 75 + .name = "OPSPUT-IRQ", 76 76 .startup = startup_opsput_irq, 77 77 .shutdown = shutdown_opsput_irq, 78 78 .enable = enable_opsput_irq, ··· 149 149 150 150 static struct irq_chip opsput_pld_irq_type = 151 151 { 152 - .typename = "OPSPUT-PLD-IRQ", 152 + .name = "OPSPUT-PLD-IRQ", 153 153 .startup = startup_opsput_pld_irq, 154 154 .shutdown = shutdown_opsput_pld_irq, 155 155 .enable = enable_opsput_pld_irq, ··· 218 218 219 219 static struct irq_chip opsput_lanpld_irq_type = 220 220 { 221 - .typename = "OPSPUT-PLD-LAN-IRQ", 221 + .name = "OPSPUT-PLD-LAN-IRQ", 222 222 .startup = startup_opsput_lanpld_irq, 223 223 .shutdown = shutdown_opsput_lanpld_irq, 224 224 .enable = enable_opsput_lanpld_irq,
+2 -2
arch/m32r/platforms/usrv/setup.c
··· 63 63 64 64 static struct irq_chip mappi_irq_type = 65 65 { 66 - .typename = "M32700-IRQ", 66 + .name = "M32700-IRQ", 67 67 .startup = startup_mappi_irq, 68 68 .shutdown = shutdown_mappi_irq, 69 69 .enable = enable_mappi_irq, ··· 136 136 137 137 static struct irq_chip m32700ut_pld_irq_type = 138 138 { 139 - .typename = "USRV-PLD-IRQ", 139 + .name = "USRV-PLD-IRQ", 140 140 .startup = startup_m32700ut_pld_irq, 141 141 .shutdown = shutdown_m32700ut_pld_irq, 142 142 .enable = enable_m32700ut_pld_irq,
+2 -2
arch/tile/kernel/irq.c
··· 208 208 } 209 209 210 210 static struct irq_chip tile_irq_chip = { 211 - .typename = "tile_irq_chip", 211 + .name = "tile_irq_chip", 212 212 .ack = tile_irq_chip_ack, 213 213 .eoi = tile_irq_chip_eoi, 214 214 .mask = tile_irq_chip_mask, ··· 288 288 for_each_online_cpu(j) 289 289 seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); 290 290 #endif 291 - seq_printf(p, " %14s", irq_desc[i].chip->typename); 291 + seq_printf(p, " %14s", irq_desc[i].chip->name); 292 292 seq_printf(p, " %s", action->name); 293 293 294 294 for (action = action->next; action; action = action->next)
+3 -3
arch/um/kernel/irq.c
··· 46 46 for_each_online_cpu(j) 47 47 seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); 48 48 #endif 49 - seq_printf(p, " %14s", irq_desc[i].chip->typename); 49 + seq_printf(p, " %14s", irq_desc[i].chip->name); 50 50 seq_printf(p, " %s", action->name); 51 51 52 52 for (action=action->next; action; action = action->next) ··· 369 369 370 370 /* This is used for everything else than the timer. */ 371 371 static struct irq_chip normal_irq_type = { 372 - .typename = "SIGIO", 372 + .name = "SIGIO", 373 373 .release = free_irq_by_irq_and_dev, 374 374 .disable = dummy, 375 375 .enable = dummy, ··· 378 378 }; 379 379 380 380 static struct irq_chip SIGVTALRM_irq_type = { 381 - .typename = "SIGVTALRM", 381 + .name = "SIGVTALRM", 382 382 .release = free_irq_by_irq_and_dev, 383 383 .shutdown = dummy, /* never called */ 384 384 .disable = dummy,
+1 -1
arch/xtensa/kernel/irq.c
··· 92 92 for_each_online_cpu(j) 93 93 seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); 94 94 #endif 95 - seq_printf(p, " %14s", irq_desc[i].chip->typename); 95 + seq_printf(p, " %14s", irq_desc[i].chip->name); 96 96 seq_printf(p, " %s", action->name); 97 97 98 98 for (action=action->next; action; action = action->next)
-6
include/linux/irq.h
··· 106 106 * @bus_sync_unlock: function to sync and unlock slow bus (i2c) chips 107 107 * 108 108 * @release: release function solely used by UML 109 - * @typename: obsoleted by name, kept as migration helper 110 109 */ 111 110 struct irq_chip { 112 111 const char *name; ··· 134 135 #ifdef CONFIG_IRQ_RELEASE_METHOD 135 136 void (*release)(unsigned int irq, void *dev_id); 136 137 #endif 137 - /* 138 - * For compatibility, ->typename is copied into ->name. 139 - * Will disappear. 140 - */ 141 - const char *typename; 142 138 }; 143 139 144 140 struct timer_rand_state;
-2
kernel/irq/chip.c
··· 344 344 if (!chip->shutdown) 345 345 chip->shutdown = chip->disable != default_disable ? 346 346 chip->disable : default_shutdown; 347 - if (!chip->name) 348 - chip->name = chip->typename; 349 347 if (!chip->end) 350 348 chip->end = dummy_irq_chip.end; 351 349 }