Commit 8ab1221c authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Matt Turner

alpha: Fixup last users of irq_chip->typename

The typename member of struct irq_chip was kept for migration purposes
and is obsolete since more than 2 years. Fix up the leftovers.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Richard Henderson <rth@twiddle.net>
Cc: linux-alpha@vger.kernel.org
Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
parent 745dd240
...@@ -92,7 +92,7 @@ show_interrupts(struct seq_file *p, void *v) ...@@ -92,7 +92,7 @@ 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(irq, j)); seq_printf(p, "%10u ", kstat_irqs_cpu(irq, j));
#endif #endif
seq_printf(p, " %14s", irq_desc[irq].chip->typename); seq_printf(p, " %14s", irq_desc[irq].chip->name);
seq_printf(p, " %c%s", seq_printf(p, " %c%s",
(action->flags & IRQF_DISABLED)?'+':' ', (action->flags & IRQF_DISABLED)?'+':' ',
action->name); action->name);
......
...@@ -228,7 +228,7 @@ struct irqaction timer_irqaction = { ...@@ -228,7 +228,7 @@ struct irqaction timer_irqaction = {
}; };
static struct irq_chip rtc_irq_type = { static struct irq_chip rtc_irq_type = {
.typename = "RTC", .name = "RTC",
.startup = rtc_startup, .startup = rtc_startup,
.shutdown = rtc_enable_disable, .shutdown = rtc_enable_disable,
.enable = rtc_enable_disable, .enable = rtc_enable_disable,
......
...@@ -84,7 +84,7 @@ i8259a_end_irq(unsigned int irq) ...@@ -84,7 +84,7 @@ i8259a_end_irq(unsigned int irq)
} }
struct irq_chip i8259a_irq_type = { struct irq_chip i8259a_irq_type = {
.typename = "XT-PIC", .name = "XT-PIC",
.startup = i8259a_startup_irq, .startup = i8259a_startup_irq,
.shutdown = i8259a_disable_irq, .shutdown = i8259a_disable_irq,
.enable = i8259a_enable_irq, .enable = i8259a_enable_irq,
......
...@@ -71,7 +71,7 @@ pyxis_mask_and_ack_irq(unsigned int irq) ...@@ -71,7 +71,7 @@ pyxis_mask_and_ack_irq(unsigned int irq)
} }
static struct irq_chip pyxis_irq_type = { static struct irq_chip pyxis_irq_type = {
.typename = "PYXIS", .name = "PYXIS",
.startup = pyxis_startup_irq, .startup = pyxis_startup_irq,
.shutdown = pyxis_disable_irq, .shutdown = pyxis_disable_irq,
.enable = pyxis_enable_irq, .enable = pyxis_enable_irq,
......
...@@ -49,7 +49,7 @@ srm_end_irq(unsigned int irq) ...@@ -49,7 +49,7 @@ srm_end_irq(unsigned int irq)
/* Handle interrupts from the SRM, assuming no additional weirdness. */ /* Handle interrupts from the SRM, assuming no additional weirdness. */
static struct irq_chip srm_irq_type = { static struct irq_chip srm_irq_type = {
.typename = "SRM", .name = "SRM",
.startup = srm_startup_irq, .startup = srm_startup_irq,
.shutdown = srm_disable_irq, .shutdown = srm_disable_irq,
.enable = srm_enable_irq, .enable = srm_enable_irq,
......
...@@ -90,7 +90,7 @@ alcor_end_irq(unsigned int irq) ...@@ -90,7 +90,7 @@ alcor_end_irq(unsigned int irq)
} }
static struct irq_chip alcor_irq_type = { static struct irq_chip alcor_irq_type = {
.typename = "ALCOR", .name = "ALCOR",
.startup = alcor_startup_irq, .startup = alcor_startup_irq,
.shutdown = alcor_disable_irq, .shutdown = alcor_disable_irq,
.enable = alcor_enable_irq, .enable = alcor_enable_irq,
......
...@@ -72,7 +72,7 @@ cabriolet_end_irq(unsigned int irq) ...@@ -72,7 +72,7 @@ cabriolet_end_irq(unsigned int irq)
} }
static struct irq_chip cabriolet_irq_type = { static struct irq_chip cabriolet_irq_type = {
.typename = "CABRIOLET", .name = "CABRIOLET",
.startup = cabriolet_startup_irq, .startup = cabriolet_startup_irq,
.shutdown = cabriolet_disable_irq, .shutdown = cabriolet_disable_irq,
.enable = cabriolet_enable_irq, .enable = cabriolet_enable_irq,
......
...@@ -199,7 +199,7 @@ clipper_set_affinity(unsigned int irq, const struct cpumask *affinity) ...@@ -199,7 +199,7 @@ clipper_set_affinity(unsigned int irq, const struct cpumask *affinity)
} }
static struct irq_chip dp264_irq_type = { static struct irq_chip dp264_irq_type = {
.typename = "DP264", .name = "DP264",
.startup = dp264_startup_irq, .startup = dp264_startup_irq,
.shutdown = dp264_disable_irq, .shutdown = dp264_disable_irq,
.enable = dp264_enable_irq, .enable = dp264_enable_irq,
...@@ -210,7 +210,7 @@ static struct irq_chip dp264_irq_type = { ...@@ -210,7 +210,7 @@ static struct irq_chip dp264_irq_type = {
}; };
static struct irq_chip clipper_irq_type = { static struct irq_chip clipper_irq_type = {
.typename = "CLIPPER", .name = "CLIPPER",
.startup = clipper_startup_irq, .startup = clipper_startup_irq,
.shutdown = clipper_disable_irq, .shutdown = clipper_disable_irq,
.enable = clipper_enable_irq, .enable = clipper_enable_irq,
......
...@@ -70,7 +70,7 @@ eb64p_end_irq(unsigned int irq) ...@@ -70,7 +70,7 @@ eb64p_end_irq(unsigned int irq)
} }
static struct irq_chip eb64p_irq_type = { static struct irq_chip eb64p_irq_type = {
.typename = "EB64P", .name = "EB64P",
.startup = eb64p_startup_irq, .startup = eb64p_startup_irq,
.shutdown = eb64p_disable_irq, .shutdown = eb64p_disable_irq,
.enable = eb64p_enable_irq, .enable = eb64p_enable_irq,
......
...@@ -81,7 +81,7 @@ eiger_end_irq(unsigned int irq) ...@@ -81,7 +81,7 @@ eiger_end_irq(unsigned int irq)
} }
static struct irq_chip eiger_irq_type = { static struct irq_chip eiger_irq_type = {
.typename = "EIGER", .name = "EIGER",
.startup = eiger_startup_irq, .startup = eiger_startup_irq,
.shutdown = eiger_disable_irq, .shutdown = eiger_disable_irq,
.enable = eiger_enable_irq, .enable = eiger_enable_irq,
......
...@@ -119,7 +119,7 @@ jensen_local_end(unsigned int irq) ...@@ -119,7 +119,7 @@ jensen_local_end(unsigned int irq)
} }
static struct irq_chip jensen_local_irq_type = { static struct irq_chip jensen_local_irq_type = {
.typename = "LOCAL", .name = "LOCAL",
.startup = jensen_local_startup, .startup = jensen_local_startup,
.shutdown = jensen_local_shutdown, .shutdown = jensen_local_shutdown,
.enable = jensen_local_enable, .enable = jensen_local_enable,
......
...@@ -170,7 +170,7 @@ marvel_irq_noop_return(unsigned int irq) ...@@ -170,7 +170,7 @@ marvel_irq_noop_return(unsigned int irq)
} }
static struct irq_chip marvel_legacy_irq_type = { static struct irq_chip marvel_legacy_irq_type = {
.typename = "LEGACY", .name = "LEGACY",
.startup = marvel_irq_noop_return, .startup = marvel_irq_noop_return,
.shutdown = marvel_irq_noop, .shutdown = marvel_irq_noop,
.enable = marvel_irq_noop, .enable = marvel_irq_noop,
...@@ -180,7 +180,7 @@ static struct irq_chip marvel_legacy_irq_type = { ...@@ -180,7 +180,7 @@ static struct irq_chip marvel_legacy_irq_type = {
}; };
static struct irq_chip io7_lsi_irq_type = { static struct irq_chip io7_lsi_irq_type = {
.typename = "LSI", .name = "LSI",
.startup = io7_startup_irq, .startup = io7_startup_irq,
.shutdown = io7_disable_irq, .shutdown = io7_disable_irq,
.enable = io7_enable_irq, .enable = io7_enable_irq,
...@@ -190,7 +190,7 @@ static struct irq_chip io7_lsi_irq_type = { ...@@ -190,7 +190,7 @@ static struct irq_chip io7_lsi_irq_type = {
}; };
static struct irq_chip io7_msi_irq_type = { static struct irq_chip io7_msi_irq_type = {
.typename = "MSI", .name = "MSI",
.startup = io7_startup_irq, .startup = io7_startup_irq,
.shutdown = io7_disable_irq, .shutdown = io7_disable_irq,
.enable = io7_enable_irq, .enable = io7_enable_irq,
......
...@@ -69,7 +69,7 @@ mikasa_end_irq(unsigned int irq) ...@@ -69,7 +69,7 @@ mikasa_end_irq(unsigned int irq)
} }
static struct irq_chip mikasa_irq_type = { static struct irq_chip mikasa_irq_type = {
.typename = "MIKASA", .name = "MIKASA",
.startup = mikasa_startup_irq, .startup = mikasa_startup_irq,
.shutdown = mikasa_disable_irq, .shutdown = mikasa_disable_irq,
.enable = mikasa_enable_irq, .enable = mikasa_enable_irq,
......
...@@ -74,7 +74,7 @@ noritake_end_irq(unsigned int irq) ...@@ -74,7 +74,7 @@ noritake_end_irq(unsigned int irq)
} }
static struct irq_chip noritake_irq_type = { static struct irq_chip noritake_irq_type = {
.typename = "NORITAKE", .name = "NORITAKE",
.startup = noritake_startup_irq, .startup = noritake_startup_irq,
.shutdown = noritake_disable_irq, .shutdown = noritake_disable_irq,
.enable = noritake_enable_irq, .enable = noritake_enable_irq,
......
...@@ -136,7 +136,7 @@ rawhide_end_irq(unsigned int irq) ...@@ -136,7 +136,7 @@ rawhide_end_irq(unsigned int irq)
} }
static struct irq_chip rawhide_irq_type = { static struct irq_chip rawhide_irq_type = {
.typename = "RAWHIDE", .name = "RAWHIDE",
.startup = rawhide_startup_irq, .startup = rawhide_startup_irq,
.shutdown = rawhide_disable_irq, .shutdown = rawhide_disable_irq,
.enable = rawhide_enable_irq, .enable = rawhide_enable_irq,
......
...@@ -73,7 +73,7 @@ rx164_end_irq(unsigned int irq) ...@@ -73,7 +73,7 @@ rx164_end_irq(unsigned int irq)
} }
static struct irq_chip rx164_irq_type = { static struct irq_chip rx164_irq_type = {
.typename = "RX164", .name = "RX164",
.startup = rx164_startup_irq, .startup = rx164_startup_irq,
.shutdown = rx164_disable_irq, .shutdown = rx164_disable_irq,
.enable = rx164_enable_irq, .enable = rx164_enable_irq,
......
...@@ -502,7 +502,7 @@ sable_lynx_mask_and_ack_irq(unsigned int irq) ...@@ -502,7 +502,7 @@ sable_lynx_mask_and_ack_irq(unsigned int irq)
} }
static struct irq_chip sable_lynx_irq_type = { static struct irq_chip sable_lynx_irq_type = {
.typename = "SABLE/LYNX", .name = "SABLE/LYNX",
.startup = sable_lynx_startup_irq, .startup = sable_lynx_startup_irq,
.shutdown = sable_lynx_disable_irq, .shutdown = sable_lynx_disable_irq,
.enable = sable_lynx_enable_irq, .enable = sable_lynx_enable_irq,
......
...@@ -75,7 +75,7 @@ takara_end_irq(unsigned int irq) ...@@ -75,7 +75,7 @@ takara_end_irq(unsigned int irq)
} }
static struct irq_chip takara_irq_type = { static struct irq_chip takara_irq_type = {
.typename = "TAKARA", .name = "TAKARA",
.startup = takara_startup_irq, .startup = takara_startup_irq,
.shutdown = takara_disable_irq, .shutdown = takara_disable_irq,
.enable = takara_enable_irq, .enable = takara_enable_irq,
......
...@@ -195,7 +195,7 @@ init_titan_irqs(struct irq_chip * ops, int imin, int imax) ...@@ -195,7 +195,7 @@ init_titan_irqs(struct irq_chip * ops, int imin, int imax)
} }
static struct irq_chip titan_irq_type = { static struct irq_chip titan_irq_type = {
.typename = "TITAN", .name = "TITAN",
.startup = titan_startup_irq, .startup = titan_startup_irq,
.shutdown = titan_disable_irq, .shutdown = titan_disable_irq,
.enable = titan_enable_irq, .enable = titan_enable_irq,
......
...@@ -158,7 +158,7 @@ wildfire_end_irq(unsigned int irq) ...@@ -158,7 +158,7 @@ wildfire_end_irq(unsigned int irq)
} }
static struct irq_chip wildfire_irq_type = { static struct irq_chip wildfire_irq_type = {
.typename = "WILDFIRE", .name = "WILDFIRE",
.startup = wildfire_startup_irq, .startup = wildfire_startup_irq,
.shutdown = wildfire_disable_irq, .shutdown = wildfire_disable_irq,
.enable = wildfire_enable_irq, .enable = wildfire_enable_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