genirq: Cleanup irq_chip->typename leftovers
A message that is not in the archive (sent off-list or not yet received): [email protected]
Chris Metcalf
Acked-byQuoted 339 lines · tip-bot for Thomas Gleixner
Commit-ID: d1ea13c6e2cce0106531852daaa93dd97aec9580 Gitweb: http://git.kernel.org/tip/d1ea13c6e2cce0106531852daaa93dd97aec9580 Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 23 Sep 2010 18:40:07 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 23 Sep 2010 19:12:26 +0200genirq: Cleanup
irq_chip->typenameleftovers3 years transition phase is enough. Cleanup the last users and remove the cruft.
Signed-off-by Thomas Gleixner <[email protected]>Cc Leo Chen <[email protected]>Cc Hirokazu Takata <[email protected]>Cc Chris Metcalf <[email protected]>Cc Jeff Dike <[email protected]>Cc Chris Zankel <[email protected]>--- arch/arm/mach-bcmring/irq.c | 6 +++--- arch/m32r/kernel/irq.c | 2 +- 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 | 6 +++--- arch/m32r/platforms/usrv/setup.c | 4 ++-- arch/tile/kernel/irq.c | 4 ++-- arch/um/kernel/irq.c | 6 +++--- arch/xtensa/kernel/irq.c | 2 +- include/linux/irq.h | 6 ------ kernel/irq/chip.c | 2 -- 15 files changed, 24 insertions(+), 32 deletions(-)arch/arm/mach-bcmring/irq.c +3
-3@@ -67,21 +67,21 @@ static void bcmring_unmask_irq2(unsigned int irq) }static struct irq_chip bcmring_irq0_chip = { - .typename ="ARM-INTC0" , + .name ="ARM-INTC0" , .ack = bcmring_mask_irq0, .mask = bcmring_mask_irq0,/* mask a specific interrupt, blocking its delivery. */ .unmask = bcmring_unmask_irq0,/* unmaks an interrupt */ };static struct irq_chip bcmring_irq1_chip = { - .typename ="ARM-INTC1" , + .name ="ARM-INTC1" , .ack = bcmring_mask_irq1, .mask = bcmring_mask_irq1, .unmask = bcmring_unmask_irq1, };static struct irq_chip bcmring_irq2_chip = { - .typename ="ARM-SINTC" , + .name ="ARM-SINTC" , .ack = bcmring_mask_irq2, .mask = bcmring_mask_irq2, .unmask = bcmring_unmask_irq2,arch/m32r/kernel/irq.c +1
-1@@ -51,7 +51,7 @@ int show_interrupts(struct seq_file *p, void *v)for_each_online_cpu (j)seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#endif -seq_printf (p," %14s" , irq_desc[i].chip->typename); +seq_printf (p," %14s" , irq_desc[i].chip->name);seq_printf (p," %s" , action->name);for (action=action->next; action; action = action->next)arch/m32r/platforms/m32104ut/setup.c +1
-1@@ -65,7 +65,7 @@ static void shutdown_m32104ut_irq(unsigned int irq)static struct irq_chip m32104ut_irq_type = { - .typename ="M32104UT-IRQ" , + .name ="M32104UT-IRQ" , .startup = startup_m32104ut_irq, .shutdown = shutdown_m32104ut_irq, .enable = enable_m32104ut_irq,arch/m32r/platforms/m32700ut/setup.c +4
-4@@ -71,7 +71,7 @@ static void shutdown_m32700ut_irq(unsigned int irq)static struct irq_chip m32700ut_irq_type = { - .typename ="M32700UT-IRQ" , + .name ="M32700UT-IRQ" , .startup = startup_m32700ut_irq, .shutdown = shutdown_m32700ut_irq, .enable = enable_m32700ut_irq,@@ -148,7 +148,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq)static struct irq_chip m32700ut_pld_irq_type = { - .typename ="M32700UT-PLD-IRQ" , + .name ="M32700UT-PLD-IRQ" , .startup = startup_m32700ut_pld_irq, .shutdown = shutdown_m32700ut_pld_irq, .enable = enable_m32700ut_pld_irq,@@ -217,7 +217,7 @@ static void shutdown_m32700ut_lanpld_irq(unsigned int irq)static struct irq_chip m32700ut_lanpld_irq_type = { - .typename ="M32700UT-PLD-LAN-IRQ" , + .name ="M32700UT-PLD-LAN-IRQ" , .startup = startup_m32700ut_lanpld_irq, .shutdown = shutdown_m32700ut_lanpld_irq, .enable = enable_m32700ut_lanpld_irq,@@ -286,7 +286,7 @@ static void shutdown_m32700ut_lcdpld_irq(unsigned int irq)static struct irq_chip m32700ut_lcdpld_irq_type = { - .typename ="M32700UT-PLD-LCD-IRQ" , + .name ="M32700UT-PLD-LCD-IRQ" , .startup = startup_m32700ut_lcdpld_irq, .shutdown = shutdown_m32700ut_lcdpld_irq, .enable = enable_m32700ut_lcdpld_irq,arch/m32r/platforms/mappi/setup.c +1
-1@@ -65,7 +65,7 @@ static void shutdown_mappi_irq(unsigned int irq)static struct irq_chip mappi_irq_type = { - .typename ="MAPPI-IRQ" , + .name ="MAPPI-IRQ" , .startup = startup_mappi_irq, .shutdown = shutdown_mappi_irq, .enable = enable_mappi_irq,arch/m32r/platforms/mappi2/setup.c +1
-1@@ -72,7 +72,7 @@ static void shutdown_mappi2_irq(unsigned int irq)static struct irq_chip mappi2_irq_type = { - .typename ="MAPPI2-IRQ" , + .name ="MAPPI2-IRQ" , .startup = startup_mappi2_irq, .shutdown = shutdown_mappi2_irq, .enable = enable_mappi2_irq,arch/m32r/platforms/mappi3/setup.c +1
-1@@ -72,7 +72,7 @@ static void shutdown_mappi3_irq(unsigned int irq)static struct irq_chip mappi3_irq_type = { - .typename ="MAPPI3-IRQ" , + .name ="MAPPI3-IRQ" , .startup = startup_mappi3_irq, .shutdown = shutdown_mappi3_irq, .enable = enable_mappi3_irq,arch/m32r/platforms/oaks32r/setup.c +1
-1@@ -63,7 +63,7 @@ static void shutdown_oaks32r_irq(unsigned int irq)static struct irq_chip oaks32r_irq_type = { - .typename ="OAKS32R-IRQ" , + .name ="OAKS32R-IRQ" , .startup = startup_oaks32r_irq, .shutdown = shutdown_oaks32r_irq, .enable = enable_oaks32r_irq,arch/m32r/platforms/opsput/setup.c +3
-3@@ -72,7 +72,7 @@ static void shutdown_opsput_irq(unsigned int irq)static struct irq_chip opsput_irq_type = { - .typename ="OPSPUT-IRQ" , + .name ="OPSPUT-IRQ" , .startup = startup_opsput_irq, .shutdown = shutdown_opsput_irq, .enable = enable_opsput_irq,@@ -149,7 +149,7 @@ static void shutdown_opsput_pld_irq(unsigned int irq)static struct irq_chip opsput_pld_irq_type = { - .typename ="OPSPUT-PLD-IRQ" , + .name ="OPSPUT-PLD-IRQ" , .startup = startup_opsput_pld_irq, .shutdown = shutdown_opsput_pld_irq, .enable = enable_opsput_pld_irq,@@ -218,7 +218,7 @@ static void shutdown_opsput_lanpld_irq(unsigned int irq)static struct irq_chip opsput_lanpld_irq_type = { - .typename ="OPSPUT-PLD-LAN-IRQ" , + .name ="OPSPUT-PLD-LAN-IRQ" , .startup = startup_opsput_lanpld_irq, .shutdown = shutdown_opsput_lanpld_irq, .enable = enable_opsput_lanpld_irq,arch/m32r/platforms/usrv/setup.c +2
-2@@ -63,7 +63,7 @@ static void shutdown_mappi_irq(unsigned int irq)static struct irq_chip mappi_irq_type = { - .typename ="M32700-IRQ" , + .name ="M32700-IRQ" , .startup = startup_mappi_irq, .shutdown = shutdown_mappi_irq, .enable = enable_mappi_irq,@@ -136,7 +136,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq)static struct irq_chip m32700ut_pld_irq_type = { - .typename ="USRV-PLD-IRQ" , + .name ="USRV-PLD-IRQ" , .startup = startup_m32700ut_pld_irq, .shutdown = shutdown_m32700ut_pld_irq, .enable = enable_m32700ut_pld_irq,arch/tile/kernel/irq.c +2
-2@@ -208,7 +208,7 @@ static void tile_irq_chip_eoi(unsigned int irq) }static struct irq_chip tile_irq_chip = { - .typename ="tile_irq_chip" , + .name ="tile_irq_chip" , .ack = tile_irq_chip_ack, .eoi = tile_irq_chip_eoi, .mask = tile_irq_chip_mask,@@ -288,7 +288,7 @@ int show_interrupts(struct seq_file *p, void *v)for_each_online_cpu (j)seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#endif -seq_printf (p," %14s" , irq_desc[i].chip->typename); +seq_printf (p," %14s" , irq_desc[i].chip->name);seq_printf (p," %s" , action->name);for (action = action->next; action; action = action->next)arch/um/kernel/irq.c +3
-3@@ -46,7 +46,7 @@ int show_interrupts(struct seq_file *p, void *v)for_each_online_cpu (j)seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#endif -seq_printf (p," %14s" , irq_desc[i].chip->typename); +seq_printf (p," %14s" , irq_desc[i].chip->name);seq_printf (p," %s" , action->name);for (action=action->next; action; action = action->next)@@ -369,7 +369,7 @@ static void dummy(unsigned int irq)/* This is used for everything else than the timer. */ static struct irq_chip normal_irq_type = { - .typename ="SIGIO" , + .name ="SIGIO" , .release = free_irq_by_irq_and_dev, .disable = dummy, .enable = dummy,@@ -378,7 +378,7 @@ static struct irq_chip normal_irq_type = { };static struct irq_chip SIGVTALRM_irq_type = { - .typename ="SIGVTALRM" , + .name ="SIGVTALRM" , .release = free_irq_by_irq_and_dev, .shutdown = dummy,/* never called */ .disable = dummy,arch/xtensa/kernel/irq.c +1
-1@@ -92,7 +92,7 @@ int show_interrupts(struct seq_file *p, void *v)for_each_online_cpu (j)seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#endif -seq_printf (p," %14s" , irq_desc[i].chip->typename); +seq_printf (p," %14s" , irq_desc[i].chip->name);seq_printf (p," %s" , action->name);for (action=action->next; action; action = action->next)include/linux/irq.h +0
-6@@ -106,7 +106,6 @@ struct msi_desc;* @bus_sync_unlock: function to sync and unlock slow bus (i2c) chips * * @release: release function solely used by UML -* @typename: obsoleted by name, kept as migration helper */ struct irq_chip {const char *name;@@ -135,11 +134,6 @@ struct irq_chip {#ifdef CONFIG_IRQ_RELEASE_METHOD void (*release)(unsigned int irq,void *dev_id);#endif -/* -* For compatibility, ->typename is copied into ->name. -* Will disappear. -*/ -const char *typename; };struct timer_rand_state ;kernel/irq/chip.c +0
-2@@ -344,8 +344,6 @@ void irq_chip_set_defaults(struct irq_chip *chip)if (!chip->shutdown) chip->shutdown = chip->disable != default_disable ? chip->disable : default_shutdown; -if (!chip->name) - chip->name = chip->typename;if (!chip->end) chip->end = dummy_irq_chip.end; }
Signature · 2 lines
Chris Metcalf, Tilera Corp. http://www.tilera.com