Commit 70d21cde authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[MIPS] use name instead of typename for each irq_chip



The "typename" field was obsoleted by the "name" field.
Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent ea6e942b
...@@ -233,7 +233,7 @@ void restore_local_and_enable(int controller, unsigned long mask) ...@@ -233,7 +233,7 @@ void restore_local_and_enable(int controller, unsigned long mask)
static struct irq_chip rise_edge_irq_type = { static struct irq_chip rise_edge_irq_type = {
.typename = "Au1000 Rise Edge", .name = "Au1000 Rise Edge",
.ack = mask_and_ack_rise_edge_irq, .ack = mask_and_ack_rise_edge_irq,
.mask = local_disable_irq, .mask = local_disable_irq,
.mask_ack = mask_and_ack_rise_edge_irq, .mask_ack = mask_and_ack_rise_edge_irq,
...@@ -242,7 +242,7 @@ static struct irq_chip rise_edge_irq_type = { ...@@ -242,7 +242,7 @@ static struct irq_chip rise_edge_irq_type = {
}; };
static struct irq_chip fall_edge_irq_type = { static struct irq_chip fall_edge_irq_type = {
.typename = "Au1000 Fall Edge", .name = "Au1000 Fall Edge",
.ack = mask_and_ack_fall_edge_irq, .ack = mask_and_ack_fall_edge_irq,
.mask = local_disable_irq, .mask = local_disable_irq,
.mask_ack = mask_and_ack_fall_edge_irq, .mask_ack = mask_and_ack_fall_edge_irq,
...@@ -251,7 +251,7 @@ static struct irq_chip fall_edge_irq_type = { ...@@ -251,7 +251,7 @@ static struct irq_chip fall_edge_irq_type = {
}; };
static struct irq_chip either_edge_irq_type = { static struct irq_chip either_edge_irq_type = {
.typename = "Au1000 Rise or Fall Edge", .name = "Au1000 Rise or Fall Edge",
.ack = mask_and_ack_either_edge_irq, .ack = mask_and_ack_either_edge_irq,
.mask = local_disable_irq, .mask = local_disable_irq,
.mask_ack = mask_and_ack_either_edge_irq, .mask_ack = mask_and_ack_either_edge_irq,
...@@ -260,7 +260,7 @@ static struct irq_chip either_edge_irq_type = { ...@@ -260,7 +260,7 @@ static struct irq_chip either_edge_irq_type = {
}; };
static struct irq_chip level_irq_type = { static struct irq_chip level_irq_type = {
.typename = "Au1000 Level", .name = "Au1000 Level",
.ack = mask_and_ack_level_irq, .ack = mask_and_ack_level_irq,
.mask = local_disable_irq, .mask = local_disable_irq,
.mask_ack = mask_and_ack_level_irq, .mask_ack = mask_and_ack_level_irq,
......
...@@ -82,7 +82,7 @@ vrc5477_irq_end(unsigned int irq) ...@@ -82,7 +82,7 @@ vrc5477_irq_end(unsigned int irq)
} }
struct irq_chip vrc5477_irq_controller = { struct irq_chip vrc5477_irq_controller = {
.typename = "vrc5477_irq", .name = "vrc5477_irq",
.ack = vrc5477_irq_ack, .ack = vrc5477_irq_ack,
.mask = vrc5477_irq_disable, .mask = vrc5477_irq_disable,
.mask_ack = vrc5477_irq_ack, .mask_ack = vrc5477_irq_ack,
......
...@@ -62,7 +62,7 @@ static inline void end_ioasic_irq(unsigned int irq) ...@@ -62,7 +62,7 @@ static inline void end_ioasic_irq(unsigned int irq)
} }
static struct irq_chip ioasic_irq_type = { static struct irq_chip ioasic_irq_type = {
.typename = "IO-ASIC", .name = "IO-ASIC",
.ack = ack_ioasic_irq, .ack = ack_ioasic_irq,
.mask = mask_ioasic_irq, .mask = mask_ioasic_irq,
.mask_ack = ack_ioasic_irq, .mask_ack = ack_ioasic_irq,
...@@ -84,7 +84,7 @@ static inline void end_ioasic_dma_irq(unsigned int irq) ...@@ -84,7 +84,7 @@ static inline void end_ioasic_dma_irq(unsigned int irq)
} }
static struct irq_chip ioasic_dma_irq_type = { static struct irq_chip ioasic_dma_irq_type = {
.typename = "IO-ASIC-DMA", .name = "IO-ASIC-DMA",
.ack = ack_ioasic_dma_irq, .ack = ack_ioasic_dma_irq,
.mask = mask_ioasic_dma_irq, .mask = mask_ioasic_dma_irq,
.mask_ack = ack_ioasic_dma_irq, .mask_ack = ack_ioasic_dma_irq,
......
...@@ -58,7 +58,7 @@ static void ack_kn02_irq(unsigned int irq) ...@@ -58,7 +58,7 @@ static void ack_kn02_irq(unsigned int irq)
} }
static struct irq_chip kn02_irq_type = { static struct irq_chip kn02_irq_type = {
.typename = "KN02-CSR", .name = "KN02-CSR",
.ack = ack_kn02_irq, .ack = ack_kn02_irq,
.mask = mask_kn02_irq, .mask = mask_kn02_irq,
.mask_ack = ack_kn02_irq, .mask_ack = ack_kn02_irq,
......
...@@ -57,7 +57,7 @@ static void emma2rh_irq_disable(unsigned int irq) ...@@ -57,7 +57,7 @@ static void emma2rh_irq_disable(unsigned int irq)
} }
struct irq_chip emma2rh_irq_controller = { struct irq_chip emma2rh_irq_controller = {
.typename = "emma2rh_irq", .name = "emma2rh_irq",
.ack = emma2rh_irq_disable, .ack = emma2rh_irq_disable,
.mask = emma2rh_irq_disable, .mask = emma2rh_irq_disable,
.mask_ack = emma2rh_irq_disable, .mask_ack = emma2rh_irq_disable,
......
...@@ -49,7 +49,7 @@ static void emma2rh_sw_irq_disable(unsigned int irq) ...@@ -49,7 +49,7 @@ static void emma2rh_sw_irq_disable(unsigned int irq)
} }
struct irq_chip emma2rh_sw_irq_controller = { struct irq_chip emma2rh_sw_irq_controller = {
.typename = "emma2rh_sw_irq", .name = "emma2rh_sw_irq",
.ack = emma2rh_sw_irq_disable, .ack = emma2rh_sw_irq_disable,
.mask = emma2rh_sw_irq_disable, .mask = emma2rh_sw_irq_disable,
.mask_ack = emma2rh_sw_irq_disable, .mask_ack = emma2rh_sw_irq_disable,
...@@ -115,7 +115,7 @@ static void emma2rh_gpio_irq_end(unsigned int irq) ...@@ -115,7 +115,7 @@ static void emma2rh_gpio_irq_end(unsigned int irq)
} }
struct irq_chip emma2rh_gpio_irq_controller = { struct irq_chip emma2rh_gpio_irq_controller = {
.typename = "emma2rh_gpio_irq", .name = "emma2rh_gpio_irq",
.ack = emma2rh_gpio_irq_ack, .ack = emma2rh_gpio_irq_ack,
.mask = emma2rh_gpio_irq_disable, .mask = emma2rh_gpio_irq_disable,
.mask_ack = emma2rh_gpio_irq_ack, .mask_ack = emma2rh_gpio_irq_ack,
......
...@@ -88,7 +88,7 @@ static void end_ev64120_irq(unsigned int irq) ...@@ -88,7 +88,7 @@ static void end_ev64120_irq(unsigned int irq)
} }
static struct irq_chip ev64120_irq_type = { static struct irq_chip ev64120_irq_type = {
.typename = "EV64120", .name = "EV64120",
.ack = disable_ev64120_irq, .ack = disable_ev64120_irq,
.mask = disable_ev64120_irq, .mask = disable_ev64120_irq,
.mask_ack = disable_ev64120_irq, .mask_ack = disable_ev64120_irq,
......
...@@ -40,7 +40,7 @@ void disable_r4030_irq(unsigned int irq) ...@@ -40,7 +40,7 @@ void disable_r4030_irq(unsigned int irq)
} }
static struct irq_chip r4030_irq_type = { static struct irq_chip r4030_irq_type = {
.typename = "R4030", .name = "R4030",
.ack = disable_r4030_irq, .ack = disable_r4030_irq,
.mask = disable_r4030_irq, .mask = disable_r4030_irq,
.mask_ack = disable_r4030_irq, .mask_ack = disable_r4030_irq,
......
...@@ -439,7 +439,7 @@ void __init arch_init_irq(void) ...@@ -439,7 +439,7 @@ void __init arch_init_irq(void)
} }
static struct irq_chip jmr3927_irq_controller = { static struct irq_chip jmr3927_irq_controller = {
.typename = "jmr3927_irq", .name = "jmr3927_irq",
.ack = jmr3927_irq_ack, .ack = jmr3927_irq_ack,
.mask = jmr3927_irq_disable, .mask = jmr3927_irq_disable,
.mask_ack = jmr3927_irq_ack, .mask_ack = jmr3927_irq_ack,
......
...@@ -112,7 +112,7 @@ msc_bind_eic_interrupt (unsigned int irq, unsigned int set) ...@@ -112,7 +112,7 @@ msc_bind_eic_interrupt (unsigned int irq, unsigned int set)
} }
struct irq_chip msc_levelirq_type = { struct irq_chip msc_levelirq_type = {
.typename = "SOC-it-Level", .name = "SOC-it-Level",
.ack = level_mask_and_ack_msc_irq, .ack = level_mask_and_ack_msc_irq,
.mask = mask_msc_irq, .mask = mask_msc_irq,
.mask_ack = level_mask_and_ack_msc_irq, .mask_ack = level_mask_and_ack_msc_irq,
...@@ -122,7 +122,7 @@ struct irq_chip msc_levelirq_type = { ...@@ -122,7 +122,7 @@ struct irq_chip msc_levelirq_type = {
}; };
struct irq_chip msc_edgeirq_type = { struct irq_chip msc_edgeirq_type = {
.typename = "SOC-it-Edge", .name = "SOC-it-Edge",
.ack = edge_mask_and_ack_msc_irq, .ack = edge_mask_and_ack_msc_irq,
.mask = mask_msc_irq, .mask = mask_msc_irq,
.mask_ack = edge_mask_and_ack_msc_irq, .mask_ack = edge_mask_and_ack_msc_irq,
......
...@@ -92,7 +92,7 @@ void ll_mv64340_irq(void) ...@@ -92,7 +92,7 @@ void ll_mv64340_irq(void)
} }
struct irq_chip mv64340_irq_type = { struct irq_chip mv64340_irq_type = {
.typename = "MV-64340", .name = "MV-64340",
.ack = mask_mv64340_irq, .ack = mask_mv64340_irq,
.mask = mask_mv64340_irq, .mask = mask_mv64340_irq,
.mask_ack = mask_mv64340_irq, .mask_ack = mask_mv64340_irq,
......
...@@ -28,7 +28,7 @@ static inline void mask_rm7k_irq(unsigned int irq) ...@@ -28,7 +28,7 @@ static inline void mask_rm7k_irq(unsigned int irq)
} }
static struct irq_chip rm7k_irq_controller = { static struct irq_chip rm7k_irq_controller = {
.typename = "RM7000", .name = "RM7000",
.ack = mask_rm7k_irq, .ack = mask_rm7k_irq,
.mask = mask_rm7k_irq, .mask = mask_rm7k_irq,
.mask_ack = mask_rm7k_irq, .mask_ack = mask_rm7k_irq,
......
...@@ -70,7 +70,7 @@ static void rm9k_perfcounter_irq_shutdown(unsigned int irq) ...@@ -70,7 +70,7 @@ static void rm9k_perfcounter_irq_shutdown(unsigned int irq)
} }
static struct irq_chip rm9k_irq_controller = { static struct irq_chip rm9k_irq_controller = {
.typename = "RM9000", .name = "RM9000",
.ack = mask_rm9k_irq, .ack = mask_rm9k_irq,
.mask = mask_rm9k_irq, .mask = mask_rm9k_irq,
.mask_ack = mask_rm9k_irq, .mask_ack = mask_rm9k_irq,
...@@ -78,7 +78,7 @@ static struct irq_chip rm9k_irq_controller = { ...@@ -78,7 +78,7 @@ static struct irq_chip rm9k_irq_controller = {
}; };
static struct irq_chip rm9k_perfcounter_irq = { static struct irq_chip rm9k_perfcounter_irq = {
.typename = "RM9000", .name = "RM9000",
.startup = rm9k_perfcounter_irq_startup, .startup = rm9k_perfcounter_irq_startup,
.shutdown = rm9k_perfcounter_irq_shutdown, .shutdown = rm9k_perfcounter_irq_shutdown,
.ack = mask_rm9k_irq, .ack = mask_rm9k_irq,
......
...@@ -49,7 +49,7 @@ static inline void mask_mips_irq(unsigned int irq) ...@@ -49,7 +49,7 @@ static inline void mask_mips_irq(unsigned int irq)
} }
static struct irq_chip mips_cpu_irq_controller = { static struct irq_chip mips_cpu_irq_controller = {
.typename = "MIPS", .name = "MIPS",
.ack = mask_mips_irq, .ack = mask_mips_irq,
.mask = mask_mips_irq, .mask = mask_mips_irq,
.mask_ack = mask_mips_irq, .mask_ack = mask_mips_irq,
...@@ -88,7 +88,7 @@ static void mips_mt_cpu_irq_ack(unsigned int irq) ...@@ -88,7 +88,7 @@ static void mips_mt_cpu_irq_ack(unsigned int irq)
} }
static struct irq_chip mips_mt_cpu_irq_controller = { static struct irq_chip mips_mt_cpu_irq_controller = {
.typename = "MIPS", .name = "MIPS",
.startup = mips_mt_cpu_irq_startup, .startup = mips_mt_cpu_irq_startup,
.ack = mips_mt_cpu_irq_ack, .ack = mips_mt_cpu_irq_ack,
.mask = mask_mips_mt_irq, .mask = mask_mips_mt_irq,
......
...@@ -45,7 +45,7 @@ void enable_lasat_irq(unsigned int irq_nr) ...@@ -45,7 +45,7 @@ void enable_lasat_irq(unsigned int irq_nr)
} }
static struct irq_chip lasat_irq_type = { static struct irq_chip lasat_irq_type = {
.typename = "Lasat", .name = "Lasat",
.ack = disable_lasat_irq, .ack = disable_lasat_irq,
.mask = disable_lasat_irq, .mask = disable_lasat_irq,
.mask_ack = disable_lasat_irq, .mask_ack = disable_lasat_irq,
......
...@@ -69,7 +69,7 @@ static void end_atlas_irq(unsigned int irq) ...@@ -69,7 +69,7 @@ static void end_atlas_irq(unsigned int irq)
} }
static struct irq_chip atlas_irq_type = { static struct irq_chip atlas_irq_type = {
.typename = "Atlas", .name = "Atlas",
.ack = disable_atlas_irq, .ack = disable_atlas_irq,
.mask = disable_atlas_irq, .mask = disable_atlas_irq,
.mask_ack = disable_atlas_irq, .mask_ack = disable_atlas_irq,
......
...@@ -84,7 +84,7 @@ void ll_cpci_irq(void) ...@@ -84,7 +84,7 @@ void ll_cpci_irq(void)
} }
struct irq_chip cpci_irq_type = { struct irq_chip cpci_irq_type = {
.typename = "CPCI/FPGA", .name = "CPCI/FPGA",
.ack = mask_cpci_irq, .ack = mask_cpci_irq,
.mask = mask_cpci_irq, .mask = mask_cpci_irq,
.mask_ack = mask_cpci_irq, .mask_ack = mask_cpci_irq,
......
...@@ -77,7 +77,7 @@ void ll_uart_irq(void) ...@@ -77,7 +77,7 @@ void ll_uart_irq(void)
} }
struct irq_chip uart_irq_type = { struct irq_chip uart_irq_type = {
.typename = "UART/FPGA", .name = "UART/FPGA",
.ack = mask_uart_irq, .ack = mask_uart_irq,
.mask = mask_uart_irq, .mask = mask_uart_irq,
.mask_ack = mask_uart_irq, .mask_ack = mask_uart_irq,
......
...@@ -159,7 +159,7 @@ int pnx8550_set_gic_priority(int irq, int priority) ...@@ -159,7 +159,7 @@ int pnx8550_set_gic_priority(int irq, int priority)
} }
static struct irq_chip level_irq_type = { static struct irq_chip level_irq_type = {
.typename = "PNX Level IRQ", .name = "PNX Level IRQ",
.ack = mask_irq, .ack = mask_irq,
.mask = mask_irq, .mask = mask_irq,
.mask_ack = mask_irq, .mask_ack = mask_irq,
......
...@@ -139,7 +139,7 @@ static void end_eisa1_irq(unsigned int irq) ...@@ -139,7 +139,7 @@ static void end_eisa1_irq(unsigned int irq)
} }
static struct irq_chip ip22_eisa1_irq_type = { static struct irq_chip ip22_eisa1_irq_type = {
.typename = "IP22 EISA", .name = "IP22 EISA",
.startup = startup_eisa1_irq, .startup = startup_eisa1_irq,
.ack = mask_and_ack_eisa1_irq, .ack = mask_and_ack_eisa1_irq,
.mask = disable_eisa1_irq, .mask = disable_eisa1_irq,
...@@ -194,7 +194,7 @@ static void end_eisa2_irq(unsigned int irq) ...@@ -194,7 +194,7 @@ static void end_eisa2_irq(unsigned int irq)
} }
static struct irq_chip ip22_eisa2_irq_type = { static struct irq_chip ip22_eisa2_irq_type = {
.typename = "IP22 EISA", .name = "IP22 EISA",
.startup = startup_eisa2_irq, .startup = startup_eisa2_irq,
.ack = mask_and_ack_eisa2_irq, .ack = mask_and_ack_eisa2_irq,
.mask = disable_eisa2_irq, .mask = disable_eisa2_irq,
......
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