Skip to content

L
linux
Commit d1ea13c6 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files
Options

genirq: Cleanup irq_chip->typename leftovers 

3 years transition phase is enough. Cleanup the last users and remove
the cruft.
Signed-off-by: default avatarThomas 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>
parent a800c7cc
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 32 deletions
arch/arm/mach-bcmring/irq.c
View file @ d1ea13c6
...@@ -67,21 +67,21 @@ static void bcmring_unmask_irq2(unsigned int irq) ...@@ -67,21 +67,21 @@ static void bcmring_unmask_irq2(unsigned int irq)
} }
static struct irq_chip bcmring_irq0_chip = { static struct irq_chip bcmring_irq0_chip = {
.typename = "ARM-INTC0", .name = "ARM-INTC0",
.ack = bcmring_mask_irq0, .ack = bcmring_mask_irq0,
.mask = bcmring_mask_irq0, /* mask a specific interrupt, blocking its delivery. */ .mask = bcmring_mask_irq0, /* mask a specific interrupt, blocking its delivery. */
.unmask = bcmring_unmask_irq0, /* unmaks an interrupt */ .unmask = bcmring_unmask_irq0, /* unmaks an interrupt */
}; };
static struct irq_chip bcmring_irq1_chip = { static struct irq_chip bcmring_irq1_chip = {
.typename = "ARM-INTC1", .name = "ARM-INTC1",
.ack = bcmring_mask_irq1, .ack = bcmring_mask_irq1,
.mask = bcmring_mask_irq1, .mask = bcmring_mask_irq1,
.unmask = bcmring_unmask_irq1, .unmask = bcmring_unmask_irq1,
}; };
static struct irq_chip bcmring_irq2_chip = { static struct irq_chip bcmring_irq2_chip = {
.typename = "ARM-SINTC", .name = "ARM-SINTC",
.ack = bcmring_mask_irq2, .ack = bcmring_mask_irq2,
.mask = bcmring_mask_irq2, .mask = bcmring_mask_irq2,
.unmask = bcmring_unmask_irq2, .unmask = bcmring_unmask_irq2,
......
arch/m32r/kernel/irq.c
View file @ d1ea13c6
...@@ -51,7 +51,7 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -51,7 +51,7 @@ int show_interrupts(struct seq_file *p, void *v)
for_each_online_cpu(j) for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
#endif #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); seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next) for (action=action->next; action; action = action->next)
......
arch/m32r/platforms/m32104ut/setup.c
View file @ d1ea13c6
...@@ -65,7 +65,7 @@ static void shutdown_m32104ut_irq(unsigned int irq) ...@@ -65,7 +65,7 @@ static void shutdown_m32104ut_irq(unsigned int irq)
static struct irq_chip m32104ut_irq_type = static struct irq_chip m32104ut_irq_type =
{ {
.typename = "M32104UT-IRQ", .name = "M32104UT-IRQ",
.startup = startup_m32104ut_irq, .startup = startup_m32104ut_irq,
.shutdown = shutdown_m32104ut_irq, .shutdown = shutdown_m32104ut_irq,
.enable = enable_m32104ut_irq, .enable = enable_m32104ut_irq,
......
arch/m32r/platforms/m32700ut/setup.c
View file @ d1ea13c6
...@@ -71,7 +71,7 @@ static void shutdown_m32700ut_irq(unsigned int irq) ...@@ -71,7 +71,7 @@ static void shutdown_m32700ut_irq(unsigned int irq)
static struct irq_chip m32700ut_irq_type = static struct irq_chip m32700ut_irq_type =
{ {
.typename = "M32700UT-IRQ", .name = "M32700UT-IRQ",
.startup = startup_m32700ut_irq, .startup = startup_m32700ut_irq,
.shutdown = shutdown_m32700ut_irq, .shutdown = shutdown_m32700ut_irq,
.enable = enable_m32700ut_irq, .enable = enable_m32700ut_irq,
...@@ -148,7 +148,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq) ...@@ -148,7 +148,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq)
static struct irq_chip m32700ut_pld_irq_type = static struct irq_chip m32700ut_pld_irq_type =
{ {
.typename = "M32700UT-PLD-IRQ", .name = "M32700UT-PLD-IRQ",
.startup = startup_m32700ut_pld_irq, .startup = startup_m32700ut_pld_irq,
.shutdown = shutdown_m32700ut_pld_irq, .shutdown = shutdown_m32700ut_pld_irq,
.enable = enable_m32700ut_pld_irq, .enable = enable_m32700ut_pld_irq,
...@@ -217,7 +217,7 @@ static void shutdown_m32700ut_lanpld_irq(unsigned int irq) ...@@ -217,7 +217,7 @@ static void shutdown_m32700ut_lanpld_irq(unsigned int irq)
static struct irq_chip m32700ut_lanpld_irq_type = static struct irq_chip m32700ut_lanpld_irq_type =
{ {
.typename = "M32700UT-PLD-LAN-IRQ", .name = "M32700UT-PLD-LAN-IRQ",
.startup = startup_m32700ut_lanpld_irq, .startup = startup_m32700ut_lanpld_irq,
.shutdown = shutdown_m32700ut_lanpld_irq, .shutdown = shutdown_m32700ut_lanpld_irq,
.enable = enable_m32700ut_lanpld_irq, .enable = enable_m32700ut_lanpld_irq,
...@@ -286,7 +286,7 @@ static void shutdown_m32700ut_lcdpld_irq(unsigned int irq) ...@@ -286,7 +286,7 @@ static void shutdown_m32700ut_lcdpld_irq(unsigned int irq)
static struct irq_chip m32700ut_lcdpld_irq_type = static struct irq_chip m32700ut_lcdpld_irq_type =
{ {
.typename = "M32700UT-PLD-LCD-IRQ", .name = "M32700UT-PLD-LCD-IRQ",
.startup = startup_m32700ut_lcdpld_irq, .startup = startup_m32700ut_lcdpld_irq,
.shutdown = shutdown_m32700ut_lcdpld_irq, .shutdown = shutdown_m32700ut_lcdpld_irq,
.enable = enable_m32700ut_lcdpld_irq, .enable = enable_m32700ut_lcdpld_irq,
......
arch/m32r/platforms/mappi/setup.c
View file @ d1ea13c6
...@@ -65,7 +65,7 @@ static void shutdown_mappi_irq(unsigned int irq) ...@@ -65,7 +65,7 @@ static void shutdown_mappi_irq(unsigned int irq)
static struct irq_chip mappi_irq_type = static struct irq_chip mappi_irq_type =
{ {
.typename = "MAPPI-IRQ", .name = "MAPPI-IRQ",
.startup = startup_mappi_irq, .startup = startup_mappi_irq,
.shutdown = shutdown_mappi_irq, .shutdown = shutdown_mappi_irq,
.enable = enable_mappi_irq, .enable = enable_mappi_irq,
......
arch/m32r/platforms/mappi2/setup.c
View file @ d1ea13c6
...@@ -72,7 +72,7 @@ static void shutdown_mappi2_irq(unsigned int irq) ...@@ -72,7 +72,7 @@ static void shutdown_mappi2_irq(unsigned int irq)
static struct irq_chip mappi2_irq_type = static struct irq_chip mappi2_irq_type =
{ {
.typename = "MAPPI2-IRQ", .name = "MAPPI2-IRQ",
.startup = startup_mappi2_irq, .startup = startup_mappi2_irq,
.shutdown = shutdown_mappi2_irq, .shutdown = shutdown_mappi2_irq,
.enable = enable_mappi2_irq, .enable = enable_mappi2_irq,
......
arch/m32r/platforms/mappi3/setup.c
View file @ d1ea13c6
...@@ -72,7 +72,7 @@ static void shutdown_mappi3_irq(unsigned int irq) ...@@ -72,7 +72,7 @@ static void shutdown_mappi3_irq(unsigned int irq)
static struct irq_chip mappi3_irq_type = static struct irq_chip mappi3_irq_type =
{ {
.typename = "MAPPI3-IRQ", .name = "MAPPI3-IRQ",
.startup = startup_mappi3_irq, .startup = startup_mappi3_irq,
.shutdown = shutdown_mappi3_irq, .shutdown = shutdown_mappi3_irq,
.enable = enable_mappi3_irq, .enable = enable_mappi3_irq,
......
arch/m32r/platforms/oaks32r/setup.c
View file @ d1ea13c6
...@@ -63,7 +63,7 @@ static void shutdown_oaks32r_irq(unsigned int irq) ...@@ -63,7 +63,7 @@ static void shutdown_oaks32r_irq(unsigned int irq)
static struct irq_chip oaks32r_irq_type = static struct irq_chip oaks32r_irq_type =
{ {
.typename = "OAKS32R-IRQ", .name = "OAKS32R-IRQ",
.startup = startup_oaks32r_irq, .startup = startup_oaks32r_irq,
.shutdown = shutdown_oaks32r_irq, .shutdown = shutdown_oaks32r_irq,
.enable = enable_oaks32r_irq, .enable = enable_oaks32r_irq,
......
arch/m32r/platforms/opsput/setup.c
View file @ d1ea13c6
...@@ -72,7 +72,7 @@ static void shutdown_opsput_irq(unsigned int irq) ...@@ -72,7 +72,7 @@ static void shutdown_opsput_irq(unsigned int irq)
static struct irq_chip opsput_irq_type = static struct irq_chip opsput_irq_type =
{ {
.typename = "OPSPUT-IRQ", .name = "OPSPUT-IRQ",
.startup = startup_opsput_irq, .startup = startup_opsput_irq,
.shutdown = shutdown_opsput_irq, .shutdown = shutdown_opsput_irq,
.enable = enable_opsput_irq, .enable = enable_opsput_irq,
...@@ -149,7 +149,7 @@ static void shutdown_opsput_pld_irq(unsigned int irq) ...@@ -149,7 +149,7 @@ static void shutdown_opsput_pld_irq(unsigned int irq)
static struct irq_chip opsput_pld_irq_type = static struct irq_chip opsput_pld_irq_type =
{ {
.typename = "OPSPUT-PLD-IRQ", .name = "OPSPUT-PLD-IRQ",
.startup = startup_opsput_pld_irq, .startup = startup_opsput_pld_irq,
.shutdown = shutdown_opsput_pld_irq, .shutdown = shutdown_opsput_pld_irq,
.enable = enable_opsput_pld_irq, .enable = enable_opsput_pld_irq,
...@@ -218,7 +218,7 @@ static void shutdown_opsput_lanpld_irq(unsigned int irq) ...@@ -218,7 +218,7 @@ static void shutdown_opsput_lanpld_irq(unsigned int irq)
static struct irq_chip opsput_lanpld_irq_type = static struct irq_chip opsput_lanpld_irq_type =
{ {
.typename = "OPSPUT-PLD-LAN-IRQ", .name = "OPSPUT-PLD-LAN-IRQ",
.startup = startup_opsput_lanpld_irq, .startup = startup_opsput_lanpld_irq,
.shutdown = shutdown_opsput_lanpld_irq, .shutdown = shutdown_opsput_lanpld_irq,
.enable = enable_opsput_lanpld_irq, .enable = enable_opsput_lanpld_irq,
......
arch/m32r/platforms/usrv/setup.c
View file @ d1ea13c6
...@@ -63,7 +63,7 @@ static void shutdown_mappi_irq(unsigned int irq) ...@@ -63,7 +63,7 @@ static void shutdown_mappi_irq(unsigned int irq)
static struct irq_chip mappi_irq_type = static struct irq_chip mappi_irq_type =
{ {
.typename = "M32700-IRQ", .name = "M32700-IRQ",
.startup = startup_mappi_irq, .startup = startup_mappi_irq,
.shutdown = shutdown_mappi_irq, .shutdown = shutdown_mappi_irq,
.enable = enable_mappi_irq, .enable = enable_mappi_irq,
...@@ -136,7 +136,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq) ...@@ -136,7 +136,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq)
static struct irq_chip m32700ut_pld_irq_type = static struct irq_chip m32700ut_pld_irq_type =
{ {
.typename = "USRV-PLD-IRQ", .name = "USRV-PLD-IRQ",
.startup = startup_m32700ut_pld_irq, .startup = startup_m32700ut_pld_irq,
.shutdown = shutdown_m32700ut_pld_irq, .shutdown = shutdown_m32700ut_pld_irq,
.enable = enable_m32700ut_pld_irq, .enable = enable_m32700ut_pld_irq,
......
arch/tile/kernel/irq.c
View file @ d1ea13c6
...@@ -208,7 +208,7 @@ static void tile_irq_chip_eoi(unsigned int irq) ...@@ -208,7 +208,7 @@ static void tile_irq_chip_eoi(unsigned int irq)
} }
static struct irq_chip tile_irq_chip = { static struct irq_chip tile_irq_chip = {
.typename = "tile_irq_chip", .name = "tile_irq_chip",
.ack = tile_irq_chip_ack, .ack = tile_irq_chip_ack,
.eoi = tile_irq_chip_eoi, .eoi = tile_irq_chip_eoi,
.mask = tile_irq_chip_mask, .mask = tile_irq_chip_mask,
...@@ -288,7 +288,7 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -288,7 +288,7 @@ int show_interrupts(struct seq_file *p, void *v)
for_each_online_cpu(j) for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
#endif #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); seq_printf(p, " %s", action->name);
for (action = action->next; action; action = action->next) for (action = action->next; action; action = action->next)
......
arch/um/kernel/irq.c
View file @ d1ea13c6
...@@ -46,7 +46,7 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -46,7 +46,7 @@ int show_interrupts(struct seq_file *p, void *v)
for_each_online_cpu(j) for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
#endif #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); seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next) for (action=action->next; action; action = action->next)
...@@ -369,7 +369,7 @@ static void dummy(unsigned int irq) ...@@ -369,7 +369,7 @@ static void dummy(unsigned int irq)
/* This is used for everything else than the timer. */ /* This is used for everything else than the timer. */
static struct irq_chip normal_irq_type = { static struct irq_chip normal_irq_type = {
.typename = "SIGIO", .name = "SIGIO",
.release = free_irq_by_irq_and_dev, .release = free_irq_by_irq_and_dev,
.disable = dummy, .disable = dummy,
.enable = dummy, .enable = dummy,
...@@ -378,7 +378,7 @@ static struct irq_chip normal_irq_type = { ...@@ -378,7 +378,7 @@ static struct irq_chip normal_irq_type = {
}; };
static struct irq_chip SIGVTALRM_irq_type = { static struct irq_chip SIGVTALRM_irq_type = {
.typename = "SIGVTALRM", .name = "SIGVTALRM",
.release = free_irq_by_irq_and_dev, .release = free_irq_by_irq_and_dev,
.shutdown = dummy, /* never called */ .shutdown = dummy, /* never called */
.disable = dummy, .disable = dummy,
......
arch/xtensa/kernel/irq.c
View file @ d1ea13c6
...@@ -92,7 +92,7 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -92,7 +92,7 @@ int show_interrupts(struct seq_file *p, void *v)
for_each_online_cpu(j) for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
#endif #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); seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next) for (action=action->next; action; action = action->next)
......
include/linux/irq.h
View file @ d1ea13c6
...@@ -106,7 +106,6 @@ struct msi_desc; ...@@ -106,7 +106,6 @@ struct msi_desc;
* @bus_sync_unlock: function to sync and unlock slow bus (i2c) chips * @bus_sync_unlock: function to sync and unlock slow bus (i2c) chips
* *
* @release: release function solely used by UML * @release: release function solely used by UML
* @typename: obsoleted by name, kept as migration helper
*/ */
struct irq_chip { struct irq_chip {
const char *name; const char *name;
...@@ -135,11 +134,6 @@ struct irq_chip { ...@@ -135,11 +134,6 @@ struct irq_chip {
#ifdef CONFIG_IRQ_RELEASE_METHOD #ifdef CONFIG_IRQ_RELEASE_METHOD
void (*release)(unsigned int irq, void *dev_id); void (*release)(unsigned int irq, void *dev_id);
#endif #endif
/*
* For compatibility, ->typename is copied into ->name.
* Will disappear.
*/
const char *typename;
}; };
struct timer_rand_state; struct timer_rand_state;
......
kernel/irq/chip.c
View file @ d1ea13c6
...@@ -344,8 +344,6 @@ void irq_chip_set_defaults(struct irq_chip *chip) ...@@ -344,8 +344,6 @@ void irq_chip_set_defaults(struct irq_chip *chip)
if (!chip->shutdown) if (!chip->shutdown)
chip->shutdown = chip->disable != default_disable ? chip->shutdown = chip->disable != default_disable ?
chip->disable : default_shutdown; chip->disable : default_shutdown;
if (!chip->name)
chip->name = chip->typename;
if (!chip->end) if (!chip->end)
chip->end = dummy_irq_chip.end; chip->end = dummy_irq_chip.end;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7