Remove the last leftover of the irq_chip migration: irq_chip.typename
cover Remove the last leftover of the irq_chip migration: irq_chip.typename
irq_chip->typename is the last migration helper leftover of the conversion from hw_irqcontroller to irq_chip.
Fixup the remaining users and kill the extra pointer in struct irq_chip.
Thanks,
tglx
PATCH 1/13 x86: 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.
--- arch/x86/kernel/visws_quirks.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/visws_quirks.c +3 -3
@@ -486,7 +486,7 @@ static void end_cobalt_irq(unsigned int }static struct irq_chip cobalt_irq_type = { - .typename ="Cobalt-APIC" , + .name ="Cobalt-APIC" , .startup = startup_cobalt_irq, .shutdown = disable_cobalt_irq, .enable = enable_cobalt_irq,
@@ -523,7 +523,7 @@ static void end_piix4_master_irq(unsigne }static struct irq_chip piix4_master_irq_type = { - .typename ="PIIX4-master" , + .name ="PIIX4-master" , .startup = startup_piix4_master_irq, .ack = ack_cobalt_irq, .end = end_piix4_master_irq,
@@ -531,7 +531,7 @@ static struct irq_chip piix4_master_irq_static struct irq_chip piix4_virtual_irq_type = { - .typename ="PIIX4-virtual" , + .name ="PIIX4-virtual" , .shutdown = disable_8259A_irq, .enable = enable_8259A_irq, .disable = disable_8259A_irq,
PATCH 2/13 xtensa: Fixup last users of irq_chip->typename
In reply to Thomas GleixnerThe typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
--- arch/xtensa/kernel/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/xtensa/kernel/irq.c +1 -1
@@ -101,7 +101,7 @@ int show_interrupts(struct seq_file *p,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)
PATCH 3/13 um: Fixup last users of irq_chip->typename
In reply to Thomas GleixnerThe typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
--- arch/um/kernel/irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/um/kernel/irq.c +3 -3
@@ -45,7 +45,7 @@ int show_interrupts(struct seq_file *p,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)
@@ -368,7 +368,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,
@@ -377,7 +377,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,
PATCH 4/13 sparc: Fixup last users of irq_chip->typename
In reply to Thomas GleixnerThe typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
--- arch/sparc/kernel/irq_64.c | 8 ++++---- arch/sparc/kernel/pci_msi.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
Index: linux-2.6/arch/sparc/kernel/irq_64.c =================================--- linux-2.6.orig/arch/sparc/kernel/irq_64.c +++ linux-2.6/arch/sparc/kernel/irq_64.c
@@ -187,7 +187,7 @@ int show_interrupts(struct seq_file *p,
for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
#endif
- seq_printf(p, " %9s", irq_desc[i].chip->typename);
+ seq_printf(p, " %9s", irq_desc[i].chip->name);
seq_printf(p, " %s", action->name);
for (action¬tion->next; action; action = action->next)
@@ -484,7 +484,7 @@ static void sun4v_virq_eoi(unsigned int
}
static struct irq_chip sun4u_irq = {
- .typename = "sun4u",
+ .name = "sun4u",
.enable = sun4u_irq_enable,
.disable = sun4u_irq_disable,
.eoi = sun4u_irq_eoi,
@@ -492,7 +492,7 @@ static struct irq_chip sun4u_irq = {
};
static struct irq_chip sun4v_irq = {
- .typename = "sun4v",
+ .name = "sun4v",
.enable = sun4v_irq_enable,
.disable = sun4v_irq_disable,
.eoi = sun4v_irq_eoi,
@@ -500,7 +500,7 @@ static struct irq_chip sun4v_irq = {
};
static struct irq_chip sun4v_virq = {
- .typename = "vsun4v",
+ .name = "vsun4v",
.enable = sun4v_virq_enable,
.disable = sun4v_virq_disable,
.eoi = sun4v_virq_eoi,
Index: linux-2.6/arch/sparc/kernel/pci_msi.c =================================--- linux-2.6.orig/arch/sparc/kernel/pci_msi.c +++ linux-2.6/arch/sparc/kernel/pci_msi.c
@@ -112,7 +112,7 @@ static void free_msi(struct pci_pbm_info
}
static struct irq_chip msi_irq = {
- .typename = "PCI-MSI",
+ .name = "PCI-MSI",
.mask = mask_msi_irq,
.unmask = unmask_msi_irq,
.enable = unmask_msi_irq,
Re: [patch 04/13] sparc: Fixup last users of irq_chip->typename
From: Thomas Gleixner <[email protected]>
Date: Tue, 17 Nov 2009 22:50:40 -0000
Quoted 4 lines
The typename member of struct
irq_chipwas kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.Signed-off-by Thomas Gleixner <[email protected]>
PATCH 5/13 sh: Fixup last users of irq_chip->typename
In reply to Thomas GleixnerThe typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
--- arch/sh/kernel/cpu/irq/imask.c | 2 +- arch/sh/kernel/cpu/irq/intc-sh5.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Index: linux-2.6/arch/sh/kernel/cpu/irq/imask.c =================================--- linux-2.6.orig/arch/sh/kernel/cpu/irq/imask.c +++ linux-2.6/arch/sh/kernel/cpu/irq/imask.c
@@ -68,7 +68,7 @@ static void unmask_imask_irq(unsigned in
}
static struct irq_chip imask_irq_chip = {
- .typename = "SR.IMASK",
+ .name = "SR.IMASK",
.mask = mask_imask_irq,
.unmask = unmask_imask_irq,
.mask_ack = mask_imask_irq,
Index: linux-2.6/arch/sh/kernel/cpu/irq/intc-sh5.c =================================--- linux-2.6.orig/arch/sh/kernel/cpu/irq/intc-sh5.c +++ linux-2.6/arch/sh/kernel/cpu/irq/intc-sh5.c
@@ -85,7 +85,7 @@ static void mask_and_ack_intc(unsigned i
static void end_intc_irq(unsigned int irq);
static struct irq_chip intc_irq_type = {
- .typename = "INTC",
+ .name = "INTC",
.startup = startup_intc_irq,
.shutdown = shutdown_intc_irq,
.enable = enable_intc_irq,
Paul Mundt
AppliedRe: [patch 05/13] sh: Fixup last users of irq_chip->typename
Quoted 6 lines · Thomas Gleixner
The typename member of struct
irq_chipwas kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.Signed-off-by Thomas Gleixner <[email protected]>Cc Paul Mundt <[email protected]>
Applied, thanks.
PATCH 6/13 powerpc: Fixup last users of irq_chip->typename
In reply to Thomas GleixnerThe typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
--- arch/powerpc/kernel/irq.c | 6 +++--- arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 2 +- arch/powerpc/platforms/52xx/media5200.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_pic.c | 8 ++++---- arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 2 +- arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 2 +- arch/powerpc/platforms/86xx/gef_pic.c | 2 +- arch/powerpc/platforms/cell/axon_msi.c | 2 +- arch/powerpc/platforms/cell/beat_interrupt.c | 2 +- arch/powerpc/platforms/cell/interrupt.c | 4 ++-- arch/powerpc/platforms/cell/spider-pic.c | 2 +- arch/powerpc/platforms/iseries/irq.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/platforms/pseries/xics.c | 4 ++-- arch/powerpc/sysdev/cpm1.c | 2 +- arch/powerpc/sysdev/cpm2_pic.c | 2 +- arch/powerpc/sysdev/fsl_msi.c | 2 +- arch/powerpc/sysdev/i8259.c | 2 +- arch/powerpc/sysdev/ipic.c | 4 ++-- arch/powerpc/sysdev/mpc8xx_pic.c | 2 +- arch/powerpc/sysdev/mpic.c | 6 +++--- arch/powerpc/sysdev/mpic_pasemi_msi.c | 2 +- arch/powerpc/sysdev/mpic_u3msi.c | 2 +- arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 +- arch/powerpc/sysdev/tsi108_pci.c | 2 +- arch/powerpc/sysdev/uic.c | 2 +- arch/powerpc/sysdev/xilinx_intc.c | 4 ++-- 29 files changed, 40 insertions(+), 40 deletions(-)
arch/powerpc/kernel/irq.c +3 -3
@@ -203,7 +203,7 @@ int show_interrupts(struct seq_file *p,seq_printf (p,"%10u " ,kstat_irqs (i));#endif /* CONFIG_SMP */ if (desc->chip) -seq_printf (p," %s " , desc->chip->typename); +seq_printf (p," %s " , desc->chip->name);else seq_puts (p," None " );seq_printf (p,"%s" , (desc->status &IRQ_LEVEL ) ?"Level " :"Edge " );
@@ -1071,8 +1071,8 @@ static int virq_debug_show(struct seq_fiseq_printf (m,"%5d " , i);seq_printf (m,"0x%05lx " ,virq_to_hw (i)); -if (desc->chip && desc->chip->typename) - p = desc->chip->typename; +if (desc->chip && desc->chip->name) + p = desc->chip->name;else p = none;seq_printf (m,"%-15s " , p);
arch/powerpc/platforms/512x/mpc5121_ads_cpld.c +1 -1
@@ -79,7 +79,7 @@ cpld_unmask_irq(unsigned int irq) }static struct irq_chip cpld_pic = { - .typename =" CPLD PIC " , + .name =" CPLD PIC " , .mask = cpld_mask_irq, .ack = cpld_mask_irq, .unmask = cpld_unmask_irq,
arch/powerpc/platforms/52xx/media5200.c +1 -1
@@ -74,7 +74,7 @@ static void media5200_irq_mask(unsigned }static struct irq_chip media5200_irq_chip = { - .typename ="Media5200 FPGA" , + .name ="Media5200 FPGA" , .unmask = media5200_irq_unmask, .mask = media5200_irq_mask, .mask_ack = media5200_irq_mask,
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +1 -1
@@ -149,7 +149,7 @@ static int mpc52xx_gpt_irq_set_type(unsi }static struct irq_chip mpc52xx_gpt_irq_chip = { - .typename ="MPC52xx GPT" , + .name ="MPC52xx GPT" , .unmask = mpc52xx_gpt_irq_unmask, .mask = mpc52xx_gpt_irq_mask, .ack = mpc52xx_gpt_irq_ack,
arch/powerpc/platforms/52xx/mpc52xx_pic.c +4 -4
@@ -220,7 +220,7 @@ static int mpc52xx_extirq_set_type(unsig }static struct irq_chip mpc52xx_extirq_irqchip = { - .typename ="MPC52xx External" , + .name ="MPC52xx External" , .mask = mpc52xx_extirq_mask, .unmask = mpc52xx_extirq_unmask, .ack = mpc52xx_extirq_ack,
@@ -258,7 +258,7 @@ static void mpc52xx_main_unmask(unsigned }static struct irq_chip mpc52xx_main_irqchip = { - .typename ="MPC52xx Main" , + .name ="MPC52xx Main" , .mask = mpc52xx_main_mask, .mask_ack = mpc52xx_main_mask, .unmask = mpc52xx_main_unmask,
@@ -291,7 +291,7 @@ static void mpc52xx_periph_unmask(unsign }static struct irq_chip mpc52xx_periph_irqchip = { - .typename ="MPC52xx Peripherals" , + .name ="MPC52xx Peripherals" , .mask = mpc52xx_periph_mask, .mask_ack = mpc52xx_periph_mask, .unmask = mpc52xx_periph_unmask,
@@ -335,7 +335,7 @@ static void mpc52xx_sdma_ack(unsigned in }static struct irq_chip mpc52xx_sdma_irqchip = { - .typename ="MPC52xx SDMA" , + .name ="MPC52xx SDMA" , .mask = mpc52xx_sdma_mask, .unmask = mpc52xx_sdma_unmask, .ack = mpc52xx_sdma_ack,
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +1 -1
@@ -69,7 +69,7 @@ static void pq2ads_pci_unmask_irq(unsign }static struct irq_chip pq2ads_pci_ic = { - .typename ="PQ2 ADS PCI" , + .name ="PQ2 ADS PCI" , .name ="PQ2 ADS PCI" , .end = pq2ads_pci_unmask_irq, .mask = pq2ads_pci_mask_irq,
arch/powerpc/platforms/85xx/socrates_fpga_pic.c +1 -1
@@ -232,7 +232,7 @@ static int socrates_fpga_pic_set_type(un }static struct irq_chip socrates_fpga_pic_chip = { - .typename =" FPGA-PIC " , + .name =" FPGA-PIC " , .ack = socrates_fpga_pic_ack, .mask = socrates_fpga_pic_mask, .mask_ack = socrates_fpga_pic_mask_ack,
arch/powerpc/platforms/86xx/gef_pic.c +1 -1
@@ -149,7 +149,7 @@ static void gef_pic_unmask(unsigned int }static struct irq_chip gef_pic_chip = { - .typename ="gefp" , + .name ="gefp" , .mask = gef_pic_mask, .mask_ack = gef_pic_mask_ack, .unmask = gef_pic_unmask,
arch/powerpc/platforms/cell/axon_msi.c +1 -1
@@ -312,7 +312,7 @@ static struct irq_chip msic_irq_chip = { .mask = mask_msi_irq, .unmask = unmask_msi_irq, .shutdown = unmask_msi_irq, - .typename = "AXON-MSI", + .name = "AXON-MSI", }; static int msic_host_map(struct irq_host *h, unsigned int virq,
arch/powerpc/platforms/cell/beat_interrupt.c +1 -1
@@ -110,7 +110,7 @@ static void beatic_end_irq(unsigned int }static struct irq_chip beatic_pic = { - .typename =" CELL-BEAT " , + .name =" CELL-BEAT " , .unmask = beatic_unmask_irq, .mask = beatic_mask_irq, .eoi = beatic_end_irq,
arch/powerpc/platforms/cell/interrupt.c +2 -2
@@ -88,7 +88,7 @@ static void iic_eoi(unsigned int irq) }static struct irq_chip iic_chip = { - .typename =" CELL-IIC " , + .name =" CELL-IIC " , .mask = iic_mask, .unmask = iic_unmask, .eoi = iic_eoi,
@@ -133,7 +133,7 @@ static void iic_ioexc_cascade(unsigned istatic struct irq_chip iic_ioexc_chip = { - .typename =" CELL-IOEX" , + .name =" CELL-IOEX" , .mask = iic_mask, .unmask = iic_unmask, .eoi = iic_ioexc_eoi,
arch/powerpc/platforms/cell/spider-pic.c +1 -1
@@ -168,7 +168,7 @@ static int spider_set_irq_type(unsigned }static struct irq_chip spider_pic = { - .typename =" SPIDER " , + .name =" SPIDER " , .unmask = spider_unmask_irq, .mask = spider_mask_irq, .ack = spider_ack_irq,
arch/powerpc/platforms/iseries/irq.c +1 -1
@@ -273,7 +273,7 @@ static void iseries_end_IRQ(unsigned int }static struct irq_chip iseries_pic = { - .typename ="iSeries irq controller" , + .name ="iSeries irq controller" , .startup = iseries_startup_IRQ, .shutdown = iseries_shutdown_IRQ, .unmask = iseries_enable_IRQ,
arch/powerpc/platforms/powermac/pic.c +1 -1
@@ -195,7 +195,7 @@ static int pmac_retrigger(unsigned int v }static struct irq_chip pmac_pic = { - .typename =" PMAC-PIC " , + .name =" PMAC-PIC " , .startup = pmac_startup_irq, .mask = pmac_mask_irq, .ack = pmac_ack_irq,
arch/powerpc/platforms/ps3/interrupt.c +1 -1
@@ -152,7 +152,7 @@ static void ps3_chip_eoi(unsigned int vi*/ static struct irq_chip ps3_irq_chip = { - .typename ="ps3" , + .name ="ps3" , .mask = ps3_chip_mask, .unmask = ps3_chip_unmask, .eoi = ps3_chip_eoi,
arch/powerpc/platforms/pseries/xics.c +2 -2
@@ -388,7 +388,7 @@ static int xics_set_affinity(unsigned in }static struct irq_chip xics_pic_direct = { - .typename =" XICS " , + .name =" XICS " , .startup = xics_startup, .mask = xics_mask_irq, .unmask = xics_unmask_irq,
@@ -397,7 +397,7 @@ static struct irq_chip xics_pic_direct = };static struct irq_chip xics_pic_lpar = { - .typename =" XICS " , + .name =" XICS " , .startup = xics_startup, .mask = xics_mask_irq, .unmask = xics_unmask_irq,
arch/powerpc/sysdev/cpm1.c +1 -1
@@ -77,7 +77,7 @@ static void cpm_end_irq(unsigned int irq }static struct irq_chip cpm_pic = { - .typename =" CPM PIC " , + .name =" CPM PIC " , .mask = cpm_mask_irq, .unmask = cpm_unmask_irq, .eoi = cpm_end_irq,
arch/powerpc/sysdev/cpm2_pic.c +1 -1
@@ -182,7 +182,7 @@ static int cpm2_set_irq_type(unsigned in }static struct irq_chip cpm2_pic = { - .typename =" CPM2 SIU " , + .name =" CPM2 SIU " , .mask = cpm2_mask_irq, .unmask = cpm2_unmask_irq, .ack = cpm2_ack,
arch/powerpc/sysdev/fsl_msi.c +1 -1
@@ -47,7 +47,7 @@ static struct irq_chip fsl_msi_chip = { .mask = mask_msi_irq, .unmask = unmask_msi_irq, .ack = fsl_msi_end_irq, - .typename = " FSL-MSI ", + .name = " FSL-MSI ", }; static int fsl_msi_host_map(struct irq_host *h, unsigned int virq,
arch/powerpc/sysdev/i8259.c +1 -1
@@ -135,7 +135,7 @@ static void i8259_unmask_irq(unsigned in }static struct irq_chip i8259_pic = { - .typename =" i8259 " , + .name =" i8259 " , .mask = i8259_mask_irq, .disable = i8259_mask_irq, .unmask = i8259_unmask_irq,
arch/powerpc/sysdev/ipic.c +2 -2
@@ -660,7 +660,7 @@ static int ipic_set_irq_type(unsigned in/* level interrupts and edge interrupts have different ack operations */ static struct irq_chip ipic_level_irq_chip = { - .typename =" IPIC " , + .name =" IPIC " , .unmask = ipic_unmask_irq, .mask = ipic_mask_irq, .mask_ack = ipic_mask_irq,
@@ -668,7 +668,7 @@ static struct irq_chip ipic_level_irq_ch };static struct irq_chip ipic_edge_irq_chip = { - .typename =" IPIC " , + .name =" IPIC " , .unmask = ipic_unmask_irq, .mask = ipic_mask_irq, .mask_ack = ipic_mask_irq_and_ack,
arch/powerpc/sysdev/mpc8xx_pic.c +1 -1
@@ -94,7 +94,7 @@ static int mpc8xx_set_irq_type(unsigned }static struct irq_chip mpc8xx_pic = { - .typename =" MPC8XX SIU " , + .name =" MPC8XX SIU " , .unmask = mpc8xx_unmask_irq, .mask = mpc8xx_mask_irq, .ack = mpc8xx_ack,
arch/powerpc/sysdev/mpic.c +3 -3
@@ -1062,19 +1062,19 @@ struct mpic * __init mpic_alloc(struct d mpic->name = name; mpic->hc_irq = mpic_irq_chip; - mpic->hc_irq.typename = name; + mpic->hc_irq.name = name;if (flags &MPIC_PRIMARY ) mpic->hc_irq.set_affinity = mpic_set_affinity;#ifdef CONFIG_MPIC_U3_HT_IRQS mpic->hc_ht_irq = mpic_irq_ht_chip; - mpic->hc_ht_irq.typename = name; + mpic->hc_ht_irq.name = name;if (flags &MPIC_PRIMARY ) mpic->hc_ht_irq.set_affinity = mpic_set_affinity;#endif /* CONFIG_MPIC_U3_HT_IRQS */ #ifdef CONFIG_SMP mpic->hc_ipi = mpic_ipi_chip; - mpic->hc_ipi.typename = name; + mpic->hc_ipi.name = name;#endif /* CONFIG_SMP */ mpic->flags = flags;
arch/powerpc/sysdev/mpic_pasemi_msi.c +1 -1
@@ -60,7 +60,7 @@ static struct irq_chip mpic_pasemi_msi_c .eoi = mpic_end_irq, .set_type = mpic_set_irq_type, .set_affinity = mpic_set_affinity, - .typename = "PASEMI-MSI ", + .name = "PASEMI-MSI ", };static int pasemi_msi_check_device (struct pci_dev *pdev,int nvec,int type)
arch/powerpc/sysdev/mpic_u3msi.c +1 -1
@@ -42,7 +42,7 @@ static struct irq_chip mpic_u3msi_chip = .eoi = mpic_end_irq, .set_type = mpic_set_irq_type, .set_affinity = mpic_set_affinity, - .typename = "MPIC-U3MSI", + .name = "MPIC-U3MSI", };static u64 read_ht_magic_addr (struct pci_dev *pdev,unsigned int pos)
arch/powerpc/sysdev/qe_lib/qe_ic.c +1 -1
@@ -237,7 +237,7 @@ static void qe_ic_mask_irq(unsigned int }static struct irq_chip qe_ic_irq_chip = { - .typename =" QEIC " , + .name =" QEIC " , .unmask = qe_ic_unmask_irq, .mask = qe_ic_mask_irq, .mask_ack = qe_ic_mask_irq,
arch/powerpc/sysdev/tsi108_pci.c +1 -1
@@ -376,7 +376,7 @@ static void tsi108_pci_irq_end(u_int irq*/ static struct irq_chip tsi108_pci_irq = { - .typename ="tsi108_PCI_int" , + .name ="tsi108_PCI_int" , .mask = tsi108_pci_irq_disable, .ack = tsi108_pci_irq_ack, .end = tsi108_pci_irq_end,
arch/powerpc/sysdev/uic.c +1 -1
@@ -177,7 +177,7 @@ static int uic_set_irq_type(unsigned int }static struct irq_chip uic_irq_chip = { - .typename =" UIC " , + .name =" UIC " , .unmask = uic_unmask_irq, .mask = uic_mask_irq, .mask_ack = uic_mask_ack_irq,
arch/powerpc/sysdev/xilinx_intc.c +2 -2
@@ -106,7 +106,7 @@ static void xilinx_intc_level_unmask(uns }static struct irq_chip xilinx_intc_level_irqchip = { - .typename ="Xilinx Level INTC" , + .name ="Xilinx Level INTC" , .mask = xilinx_intc_mask, .mask_ack = xilinx_intc_mask, .unmask = xilinx_intc_level_unmask,
@@ -133,7 +133,7 @@ static void xilinx_intc_edge_ack(unsigne }static struct irq_chip xilinx_intc_edge_irqchip = { - .typename ="Xilinx Edge INTC" , + .name ="Xilinx Edge INTC" , .mask = xilinx_intc_mask, .unmask = xilinx_intc_edge_unmask, .ack = xilinx_intc_edge_ack,
Re: [patch 06/13] powerpc: Fixup last users of irq_chip->typename
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c static void pq2ads_pci_unmask_irq(unsign · line 75
Quoted 13 lines · Thomas Gleixner
Index:
linux-2.6/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
===================================================================arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +1
-1@@ -69,7 +69,7 @@ static void pq2ads_pci_unmask_irq(unsign }static struct irq_chip pq2ads_pci_ic = { - .typename ="PQ2 ADS PCI" , + .name ="PQ2 ADS PCI" , .name ="PQ2 ADS PCI" , .end = pq2ads_pci_unmask_irq, .mask = pq2ads_pci_mask_irq,
Duplicate ".name"...
-Scott
Re: [patch 06/13] powerpc: Fixup last users of irq_chip->typename
Quoted 8 lines · Scott Wood
Quoted 7 lines · Thomas Gleixner
Index:
linux-2.6/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
===================================================================arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +0
-0@@ -69,7 +69,7 @@ static void pq2ads_pci_unmask_irq(unsign }
Quoted 8 lines
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c static void pq2ads_pci_unmask_irq(unsign · line 75
Quoted 6 lines
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +1
-1static struct irq_chip pq2ads_pci_ic = { - .typename ="PQ2 ADS PCI" , + .name ="PQ2 ADS PCI" , .name ="PQ2 ADS PCI" , .end = pq2ads_pci_unmask_irq, .mask = pq2ads_pci_mask_irq,Duplicate ".name"...
Darn.
PATCH 1/1 powerpc: Fixup last users of irq_chip->typename - V2
The typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
--- arch/powerpc/kernel/irq.c | 6 +++--- arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 2 +- arch/powerpc/platforms/52xx/media5200.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_pic.c | 8 ++++---- arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 1 - arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 2 +- arch/powerpc/platforms/86xx/gef_pic.c | 2 +- arch/powerpc/platforms/cell/axon_msi.c | 2 +- arch/powerpc/platforms/cell/beat_interrupt.c | 2 +- arch/powerpc/platforms/cell/interrupt.c | 4 ++-- arch/powerpc/platforms/cell/spider-pic.c | 2 +- arch/powerpc/platforms/iseries/irq.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/platforms/pseries/xics.c | 4 ++-- arch/powerpc/sysdev/cpm1.c | 2 +- arch/powerpc/sysdev/cpm2_pic.c | 2 +- arch/powerpc/sysdev/fsl_msi.c | 2 +- arch/powerpc/sysdev/i8259.c | 2 +- arch/powerpc/sysdev/ipic.c | 4 ++-- arch/powerpc/sysdev/mpc8xx_pic.c | 2 +- arch/powerpc/sysdev/mpic.c | 6 +++--- arch/powerpc/sysdev/mpic_pasemi_msi.c | 2 +- arch/powerpc/sysdev/mpic_u3msi.c | 2 +- arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 +- arch/powerpc/sysdev/tsi108_pci.c | 2 +- arch/powerpc/sysdev/uic.c | 2 +- arch/powerpc/sysdev/xilinx_intc.c | 4 ++-- 29 files changed, 39 insertions(+), 40 deletions(-)
arch/powerpc/kernel/irq.c +3 -3
@@ -203,7 +203,7 @@ int show_interrupts(struct seq_file *p,seq_printf (p,"%10u " ,kstat_irqs (i));#endif /* CONFIG_SMP */ if (desc->chip) -seq_printf (p," %s " , desc->chip->typename); +seq_printf (p," %s " , desc->chip->name);else seq_puts (p," None " );seq_printf (p,"%s" , (desc->status &IRQ_LEVEL ) ?"Level " :"Edge " );
@@ -1071,8 +1071,8 @@ static int virq_debug_show(struct seq_fiseq_printf (m,"%5d " , i);seq_printf (m,"0x%05lx " ,virq_to_hw (i)); -if (desc->chip && desc->chip->typename) - p = desc->chip->typename; +if (desc->chip && desc->chip->name) + p = desc->chip->name;else p = none;seq_printf (m,"%-15s " , p);
arch/powerpc/platforms/512x/mpc5121_ads_cpld.c +1 -1
@@ -79,7 +79,7 @@ cpld_unmask_irq(unsigned int irq) }static struct irq_chip cpld_pic = { - .typename =" CPLD PIC " , + .name =" CPLD PIC " , .mask = cpld_mask_irq, .ack = cpld_mask_irq, .unmask = cpld_unmask_irq,
arch/powerpc/platforms/52xx/media5200.c +1 -1
@@ -74,7 +74,7 @@ static void media5200_irq_mask(unsigned }static struct irq_chip media5200_irq_chip = { - .typename ="Media5200 FPGA" , + .name ="Media5200 FPGA" , .unmask = media5200_irq_unmask, .mask = media5200_irq_mask, .mask_ack = media5200_irq_mask,
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +1 -1
@@ -149,7 +149,7 @@ static int mpc52xx_gpt_irq_set_type(unsi }static struct irq_chip mpc52xx_gpt_irq_chip = { - .typename ="MPC52xx GPT" , + .name ="MPC52xx GPT" , .unmask = mpc52xx_gpt_irq_unmask, .mask = mpc52xx_gpt_irq_mask, .ack = mpc52xx_gpt_irq_ack,
arch/powerpc/platforms/52xx/mpc52xx_pic.c +4 -4
@@ -220,7 +220,7 @@ static int mpc52xx_extirq_set_type(unsig }static struct irq_chip mpc52xx_extirq_irqchip = { - .typename ="MPC52xx External" , + .name ="MPC52xx External" , .mask = mpc52xx_extirq_mask, .unmask = mpc52xx_extirq_unmask, .ack = mpc52xx_extirq_ack,
@@ -258,7 +258,7 @@ static void mpc52xx_main_unmask(unsigned }static struct irq_chip mpc52xx_main_irqchip = { - .typename ="MPC52xx Main" , + .name ="MPC52xx Main" , .mask = mpc52xx_main_mask, .mask_ack = mpc52xx_main_mask, .unmask = mpc52xx_main_unmask,
@@ -291,7 +291,7 @@ static void mpc52xx_periph_unmask(unsign }static struct irq_chip mpc52xx_periph_irqchip = { - .typename ="MPC52xx Peripherals" , + .name ="MPC52xx Peripherals" , .mask = mpc52xx_periph_mask, .mask_ack = mpc52xx_periph_mask, .unmask = mpc52xx_periph_unmask,
@@ -335,7 +335,7 @@ static void mpc52xx_sdma_ack(unsigned in }static struct irq_chip mpc52xx_sdma_irqchip = { - .typename ="MPC52xx SDMA" , + .name ="MPC52xx SDMA" , .mask = mpc52xx_sdma_mask, .unmask = mpc52xx_sdma_unmask, .ack = mpc52xx_sdma_ack,
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +0 -1
@@ -69,7 +69,6 @@ static void pq2ads_pci_unmask_irq(unsign }static struct irq_chip pq2ads_pci_ic = { - .typename ="PQ2 ADS PCI" , .name ="PQ2 ADS PCI" , .end = pq2ads_pci_unmask_irq, .mask = pq2ads_pci_mask_irq,
arch/powerpc/platforms/85xx/socrates_fpga_pic.c +1 -1
@@ -232,7 +232,7 @@ static int socrates_fpga_pic_set_type(un }static struct irq_chip socrates_fpga_pic_chip = { - .typename =" FPGA-PIC " , + .name =" FPGA-PIC " , .ack = socrates_fpga_pic_ack, .mask = socrates_fpga_pic_mask, .mask_ack = socrates_fpga_pic_mask_ack,
arch/powerpc/platforms/86xx/gef_pic.c +1 -1
@@ -149,7 +149,7 @@ static void gef_pic_unmask(unsigned int }static struct irq_chip gef_pic_chip = { - .typename ="gefp" , + .name ="gefp" , .mask = gef_pic_mask, .mask_ack = gef_pic_mask_ack, .unmask = gef_pic_unmask,
arch/powerpc/platforms/cell/axon_msi.c +1 -1
@@ -312,7 +312,7 @@ static struct irq_chip msic_irq_chip = { .mask = mask_msi_irq, .unmask = unmask_msi_irq, .shutdown = unmask_msi_irq, - .typename = "AXON-MSI", + .name = "AXON-MSI", }; static int msic_host_map(struct irq_host *h, unsigned int virq,
arch/powerpc/platforms/cell/beat_interrupt.c +1 -1
@@ -110,7 +110,7 @@ static void beatic_end_irq(unsigned int }static struct irq_chip beatic_pic = { - .typename =" CELL-BEAT " , + .name =" CELL-BEAT " , .unmask = beatic_unmask_irq, .mask = beatic_mask_irq, .eoi = beatic_end_irq,
arch/powerpc/platforms/cell/interrupt.c +2 -2
@@ -88,7 +88,7 @@ static void iic_eoi(unsigned int irq) }static struct irq_chip iic_chip = { - .typename =" CELL-IIC " , + .name =" CELL-IIC " , .mask = iic_mask, .unmask = iic_unmask, .eoi = iic_eoi,
@@ -133,7 +133,7 @@ static void iic_ioexc_cascade(unsigned istatic struct irq_chip iic_ioexc_chip = { - .typename =" CELL-IOEX" , + .name =" CELL-IOEX" , .mask = iic_mask, .unmask = iic_unmask, .eoi = iic_ioexc_eoi,
arch/powerpc/platforms/cell/spider-pic.c +1 -1
@@ -168,7 +168,7 @@ static int spider_set_irq_type(unsigned }static struct irq_chip spider_pic = { - .typename =" SPIDER " , + .name =" SPIDER " , .unmask = spider_unmask_irq, .mask = spider_mask_irq, .ack = spider_ack_irq,
arch/powerpc/platforms/iseries/irq.c +1 -1
@@ -273,7 +273,7 @@ static void iseries_end_IRQ(unsigned int }static struct irq_chip iseries_pic = { - .typename ="iSeries irq controller" , + .name ="iSeries irq controller" , .startup = iseries_startup_IRQ, .shutdown = iseries_shutdown_IRQ, .unmask = iseries_enable_IRQ,
arch/powerpc/platforms/powermac/pic.c +1 -1
@@ -195,7 +195,7 @@ static int pmac_retrigger(unsigned int v }static struct irq_chip pmac_pic = { - .typename =" PMAC-PIC " , + .name =" PMAC-PIC " , .startup = pmac_startup_irq, .mask = pmac_mask_irq, .ack = pmac_ack_irq,
arch/powerpc/platforms/ps3/interrupt.c +1 -1
@@ -152,7 +152,7 @@ static void ps3_chip_eoi(unsigned int vi*/ static struct irq_chip ps3_irq_chip = { - .typename ="ps3" , + .name ="ps3" , .mask = ps3_chip_mask, .unmask = ps3_chip_unmask, .eoi = ps3_chip_eoi,
arch/powerpc/platforms/pseries/xics.c +2 -2
@@ -388,7 +388,7 @@ static int xics_set_affinity(unsigned in }static struct irq_chip xics_pic_direct = { - .typename =" XICS " , + .name =" XICS " , .startup = xics_startup, .mask = xics_mask_irq, .unmask = xics_unmask_irq,
@@ -397,7 +397,7 @@ static struct irq_chip xics_pic_direct = };static struct irq_chip xics_pic_lpar = { - .typename =" XICS " , + .name =" XICS " , .startup = xics_startup, .mask = xics_mask_irq, .unmask = xics_unmask_irq,
arch/powerpc/sysdev/cpm1.c +1 -1
@@ -77,7 +77,7 @@ static void cpm_end_irq(unsigned int irq }static struct irq_chip cpm_pic = { - .typename =" CPM PIC " , + .name =" CPM PIC " , .mask = cpm_mask_irq, .unmask = cpm_unmask_irq, .eoi = cpm_end_irq,
arch/powerpc/sysdev/cpm2_pic.c +1 -1
@@ -182,7 +182,7 @@ static int cpm2_set_irq_type(unsigned in }static struct irq_chip cpm2_pic = { - .typename =" CPM2 SIU " , + .name =" CPM2 SIU " , .mask = cpm2_mask_irq, .unmask = cpm2_unmask_irq, .ack = cpm2_ack,
arch/powerpc/sysdev/fsl_msi.c +1 -1
@@ -47,7 +47,7 @@ static struct irq_chip fsl_msi_chip = { .mask = mask_msi_irq, .unmask = unmask_msi_irq, .ack = fsl_msi_end_irq, - .typename = " FSL-MSI ", + .name = " FSL-MSI ", }; static int fsl_msi_host_map(struct irq_host *h, unsigned int virq,
arch/powerpc/sysdev/i8259.c +1 -1
@@ -135,7 +135,7 @@ static void i8259_unmask_irq(unsigned in }static struct irq_chip i8259_pic = { - .typename =" i8259 " , + .name =" i8259 " , .mask = i8259_mask_irq, .disable = i8259_mask_irq, .unmask = i8259_unmask_irq,
arch/powerpc/sysdev/ipic.c +2 -2
@@ -660,7 +660,7 @@ static int ipic_set_irq_type(unsigned in/* level interrupts and edge interrupts have different ack operations */ static struct irq_chip ipic_level_irq_chip = { - .typename =" IPIC " , + .name =" IPIC " , .unmask = ipic_unmask_irq, .mask = ipic_mask_irq, .mask_ack = ipic_mask_irq,
@@ -668,7 +668,7 @@ static struct irq_chip ipic_level_irq_ch };static struct irq_chip ipic_edge_irq_chip = { - .typename =" IPIC " , + .name =" IPIC " , .unmask = ipic_unmask_irq, .mask = ipic_mask_irq, .mask_ack = ipic_mask_irq_and_ack,
arch/powerpc/sysdev/mpc8xx_pic.c +1 -1
@@ -94,7 +94,7 @@ static int mpc8xx_set_irq_type(unsigned }static struct irq_chip mpc8xx_pic = { - .typename =" MPC8XX SIU " , + .name =" MPC8XX SIU " , .unmask = mpc8xx_unmask_irq, .mask = mpc8xx_mask_irq, .ack = mpc8xx_ack,
arch/powerpc/sysdev/mpic.c +3 -3
@@ -1062,19 +1062,19 @@ struct mpic * __init mpic_alloc(struct d mpic->name = name; mpic->hc_irq = mpic_irq_chip; - mpic->hc_irq.typename = name; + mpic->hc_irq.name = name;if (flags &MPIC_PRIMARY ) mpic->hc_irq.set_affinity = mpic_set_affinity;#ifdef CONFIG_MPIC_U3_HT_IRQS mpic->hc_ht_irq = mpic_irq_ht_chip; - mpic->hc_ht_irq.typename = name; + mpic->hc_ht_irq.name = name;if (flags &MPIC_PRIMARY ) mpic->hc_ht_irq.set_affinity = mpic_set_affinity;#endif /* CONFIG_MPIC_U3_HT_IRQS */ #ifdef CONFIG_SMP mpic->hc_ipi = mpic_ipi_chip; - mpic->hc_ipi.typename = name; + mpic->hc_ipi.name = name;#endif /* CONFIG_SMP */ mpic->flags = flags;
arch/powerpc/sysdev/mpic_pasemi_msi.c +1 -1
@@ -60,7 +60,7 @@ static struct irq_chip mpic_pasemi_msi_c .eoi = mpic_end_irq, .set_type = mpic_set_irq_type, .set_affinity = mpic_set_affinity, - .typename = "PASEMI-MSI ", + .name = "PASEMI-MSI ", };static int pasemi_msi_check_device (struct pci_dev *pdev,int nvec,int type)
arch/powerpc/sysdev/mpic_u3msi.c +1 -1
@@ -42,7 +42,7 @@ static struct irq_chip mpic_u3msi_chip = .eoi = mpic_end_irq, .set_type = mpic_set_irq_type, .set_affinity = mpic_set_affinity, - .typename = "MPIC-U3MSI", + .name = "MPIC-U3MSI", };static u64 read_ht_magic_addr (struct pci_dev *pdev,unsigned int pos)
arch/powerpc/sysdev/qe_lib/qe_ic.c +1 -1
@@ -237,7 +237,7 @@ static void qe_ic_mask_irq(unsigned int }static struct irq_chip qe_ic_irq_chip = { - .typename =" QEIC " , + .name =" QEIC " , .unmask = qe_ic_unmask_irq, .mask = qe_ic_mask_irq, .mask_ack = qe_ic_mask_irq,
arch/powerpc/sysdev/tsi108_pci.c +1 -1
@@ -376,7 +376,7 @@ static void tsi108_pci_irq_end(u_int irq*/ static struct irq_chip tsi108_pci_irq = { - .typename ="tsi108_PCI_int" , + .name ="tsi108_PCI_int" , .mask = tsi108_pci_irq_disable, .ack = tsi108_pci_irq_ack, .end = tsi108_pci_irq_end,
arch/powerpc/sysdev/uic.c +1 -1
@@ -177,7 +177,7 @@ static int uic_set_irq_type(unsigned int }static struct irq_chip uic_irq_chip = { - .typename =" UIC " , + .name =" UIC " , .unmask = uic_unmask_irq, .mask = uic_mask_irq, .mask_ack = uic_mask_ack_irq,
arch/powerpc/sysdev/xilinx_intc.c +2 -2
@@ -106,7 +106,7 @@ static void xilinx_intc_level_unmask(uns }static struct irq_chip xilinx_intc_level_irqchip = { - .typename ="Xilinx Level INTC" , + .name ="Xilinx Level INTC" , .mask = xilinx_intc_mask, .mask_ack = xilinx_intc_mask, .unmask = xilinx_intc_level_unmask,
@@ -133,7 +133,7 @@ static void xilinx_intc_edge_ack(unsigne }static struct irq_chip xilinx_intc_edge_irqchip = { - .typename ="Xilinx Edge INTC" , + .name ="Xilinx Edge INTC" , .mask = xilinx_intc_mask, .unmask = xilinx_intc_edge_unmask, .ack = xilinx_intc_edge_ack,
Re: [patch] powerpc: Fixup last users of irq_chip->typename - V2
Quoted 8 lines · Thomas Gleixner
The typename member of struct
irq_chipwas kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.Index:
linux-2.6-tip/arch/powerpc/platforms/ps3/interrupt.c
===================================================================
arch/powerpc/platforms/ps3/interrupt.c static void ps3_chip_eoi(unsigned int vi · line 158
Quoted 8 lines
arch/powerpc/platforms/ps3/interrupt.c +1
-1@@ -152,7 +152,7 @@ static void ps3_chip_eoi(unsigned int vi*/ static struct irq_chip ps3_irq_chip = { - .typename ="ps3" , + .name ="ps3" , .mask = ps3_chip_mask, .unmask = ps3_chip_unmask, .eoi = ps3_chip_eoi,
This PS3 part looks OK.
Grant Likely
Acked-byRe: [patch 06/13] powerpc: Fixup last users of irq_chip->typename
In reply to Thomas GleixnerOn Wed, Nov 18, 2009 at 1:41 PM, Thomas Gleixner <[email protected]> wrote= :
Quoted 4 lines · Scott Wood
Quoted 3 lines · Thomas Gleixner
Quoted 2 lines
Index:
linux-2.6/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Quoted 14 lines
Quoted 5 lines
Quoted 5 lines
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +0
-0@@ -69,7 +69,7 @@ static void pq2ads_pci_unmask_irq(unsign =A0}Quoted 8 lines
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c static void pq2ads_pci_unmask_irq(unsign · line 75
Quoted 6 lines
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +1
-1=A0static struct irq_chip pq2ads_pci_ic =3D { - =A0 .typename =3D "PQ2 ADS PCI", + =A0 .name =3D "PQ2 ADS PCI", =A0 =A0 .name =3D "PQ2 ADS PCI", =A0 =A0 .end =3D pq2ads_pci_unmask_irq, =A0 =A0 .mask =3D pq2ads_pci_mask_irq,Duplicate ".name"...
Quoted 1 line
Darn.
Other than that, looks good to me.
--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
PATCH 7/13 parisc: Fixup last users of irq_chip->typename
In reply to Thomas GleixnerThe typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
--- arch/parisc/kernel/irq.c | 4 ++-- drivers/parisc/dino.c | 2 +- drivers/parisc/eisa.c | 2 +- drivers/parisc/gsc.c | 2 +- drivers/parisc/iosapic.c | 2 +- drivers/parisc/superio.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
arch/parisc/kernel/irq.c +2 -2
@@ -145,7 +145,7 @@ static int cpu_set_affinity_irq(unsigned#endif static struct irq_chip cpu_interrupt_type = { - .typename ="CPU" , + .name ="CPU" , .startup = cpu_startup_irq, .shutdown = cpu_disable_irq, .enable = cpu_enable_irq,
@@ -192,7 +192,7 @@ int show_interrupts(struct seq_file *p,seq_printf (p,"%10u " ,kstat_irqs (i));#endif -seq_printf (p," %14s" , irq_desc[i].chip->typename); +seq_printf (p," %14s" , irq_desc[i].chip->name);#ifndef PARISC_IRQ_CR16_COUNTS seq_printf (p," %s" , action->name);
drivers/parisc/dino.c +1 -1
@@ -354,7 +354,7 @@ static unsigned int dino_startup_irq(uns }static struct irq_chip dino_interrupt_type = { - .typename ="GSC-PCI" , + .name ="GSC-PCI" , .startup = dino_startup_irq, .shutdown = dino_disable_irq, .enable = dino_enable_irq,
drivers/parisc/eisa.c +1 -1
@@ -189,7 +189,7 @@ static unsigned int eisa_startup_irq(uns }static struct irq_chip eisa_interrupt_type = { - .typename ="EISA" , + .name ="EISA" , .startup = eisa_startup_irq, .shutdown = eisa_disable_irq, .enable = eisa_enable_irq,
drivers/parisc/gsc.c +1 -1
@@ -149,7 +149,7 @@ static unsigned int gsc_asic_startup_irq }static struct irq_chip gsc_asic_interrupt_type = { - .typename ="GSC-ASIC" , + .name ="GSC-ASIC" , .startup = gsc_asic_startup_irq, .shutdown = gsc_asic_disable_irq, .enable = gsc_asic_enable_irq,
drivers/parisc/iosapic.c +1 -1
@@ -730,7 +730,7 @@ static int iosapic_set_affinity_irq(unsi#endif static struct irq_chip iosapic_interrupt_type = { - .typename ="IO-SAPIC-level" , + .name ="IO-SAPIC-level" , .startup = iosapic_startup_irq, .shutdown = iosapic_disable_irq, .enable = iosapic_enable_irq,
drivers/parisc/superio.c +1 -1
@@ -326,7 +326,7 @@ static unsigned int superio_startup_irq( }static struct irq_chip superio_interrupt_type = { - .typename =SUPERIO , + .name =SUPERIO , .startup = superio_startup_irq, .shutdown = superio_disable_irq, .enable = superio_enable_irq,
Kyle McMartin
AppliedRe: [patch 07/13] parisc: Fixup last users of irq_chip->typename
Quoted 6 lines · Thomas Gleixner
The typename member of struct
irq_chipwas kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.Signed-off-by Thomas Gleixner <[email protected]>Cc Kyle McMartin <[email protected]>
Thanks, applied.
PATCH 8/13 mips: Fixup last users of irq_chip->typename
In reply to Thomas GleixnerThe typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
--- arch/mips/nxp/pnx833x/common/interrupts.c | 4 ++-- arch/mips/sni/a20r.c | 2 +- arch/mips/sni/pcimt.c | 2 +- arch/mips/sni/pcit.c | 2 +- arch/mips/sni/rm200.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
arch/mips/nxp/pnx833x/common/interrupts.c +2 -2
@@ -295,7 +295,7 @@ static int pnx833x_set_type_gpio_irq(uns }static struct irq_chip pnx833x_pic_irq_type = { - .typename ="PNX-PIC" , + .name ="PNX-PIC" , .startup = pnx833x_startup_pic_irq, .shutdown = pnx833x_shutdown_pic_irq, .enable = pnx833x_enable_pic_irq,
@@ -305,7 +305,7 @@ static struct irq_chip pnx833x_pic_irq_t };static struct irq_chip pnx833x_gpio_irq_type = { - .typename ="PNX-GPIO" , + .name ="PNX-GPIO" , .startup = pnx833x_startup_gpio_irq, .shutdown = pnx833x_disable_gpio_irq, .enable = pnx833x_enable_gpio_irq,
arch/mips/sni/a20r.c +1 -1
@@ -188,7 +188,7 @@ static void end_a20r_irq(unsigned int ir }static struct irq_chip a20r_irq_type = { - .typename ="A20R" , + .name ="A20R" , .ack = mask_a20r_irq, .mask = mask_a20r_irq, .mask_ack = mask_a20r_irq,
arch/mips/sni/pcimt.c +1 -1
@@ -214,7 +214,7 @@ static void end_pcimt_irq(unsigned int i }static struct irq_chip pcimt_irq_type = { - .typename ="PCIMT" , + .name ="PCIMT" , .ack = disable_pcimt_irq, .mask = disable_pcimt_irq, .mask_ack = disable_pcimt_irq,
arch/mips/sni/pcit.c +1 -1
@@ -176,7 +176,7 @@ void end_pcit_irq(unsigned int irq) }static struct irq_chip pcit_irq_type = { - .typename ="PCIT" , + .name ="PCIT" , .ack = disable_pcit_irq, .mask = disable_pcit_irq, .mask_ack = disable_pcit_irq,
arch/mips/sni/rm200.c +1 -1
@@ -449,7 +449,7 @@ void end_rm200_irq(unsigned int irq) }static struct irq_chip rm200_irq_type = { - .typename ="RM200" , + .name ="RM200" , .ack = disable_rm200_irq, .mask = disable_rm200_irq, .mask_ack = disable_rm200_irq,
Re: [patch 08/13] mips: Fixup last users of irq_chip->typename
Quoted 6 lines · Thomas Gleixner
The typename member of struct
irq_chipwas kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.Signed-off-by Thomas Gleixner <[email protected]>Cc Ralf Baechle <[email protected]>
Looks good. I assume you want to merge the whole series via tip, so
Ralf
Re: [patch 08/13] mips: Fixup last users of irq_chip->typename
Quoted 5 lines · Ralf Baechle
Quoted 3 lines · Thomas Gleixner
The typename member of struct
irq_chipwas kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
Quoted 7 lines
Quoted 3 lines
Signed-off-by Thomas Gleixner <[email protected]>Cc Ralf Baechle <[email protected]>Looks good. I assume you want to merge the whole series via tip, so
Acked-by Ralf Baechle <[email protected]>
You can pick it up as well. The patches are independent, just the last one which removes typename from irq_chip depends on the arch patches being merged. Either way works fine.
Thanks,
tglx
Re: [patch 08/13] mips: Fixup last users of irq_chip->typename
Quoted 7 lines · Thomas Gleixner
Quoted 7 lines
Quoted 6 lines
The typename member of struct
irq_chipwas kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.Signed-off-by Thomas Gleixner <[email protected]>Cc Ralf Baechle <[email protected]>
Quoted 7 lines
Quoted 3 lines
Looks good. I assume you want to merge the whole series via tip, so
Acked-by Ralf Baechle <[email protected]>You can pick it up as well. The patches are independent, just the last one which removes typename from
irq_chipdepends on the arch patches being merged. Either way works fine.
Okay, queued for 2.6.33 then.
Thanks!
Ralf
PATCH 9/13 m32r: Fixup last users of irq_chip->typename
In reply to Thomas GleixnerThe typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
--- 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 ++-- 9 files changed, 15 insertions(+), 15 deletions(-)
arch/m32r/kernel/irq.c +1 -1
@@ -51,7 +51,7 @@ int show_interrupts(struct seq_file *p,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(unsignstatic 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(unsignstatic 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(unstatic 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_irqstatic 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_irqstatic 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(unsignedstatic 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(unsignedstatic 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(unsignedstatic 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(unsignestatic 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(unsignedstatic 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(unsistatic 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(ustatic 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(unsignedstatic 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(unstatic 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,
Re: [patch 09/13] m32r: Fixup last users of irq_chip->typename
From: Thomas Gleixner <[email protected]>
Subject: [patch 09/13] m32r: Fixup last users of irq_chip->typename
Date: Tue, 17 Nov 2009 22:51:10 +0000
Quoted 7 lines
The typename member of struct
irq_chipwas kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.Signed-off-by Thomas Gleixner <[email protected]>Cc Hirokazu Takata <[email protected]>---
Thank you.
PATCH 10/13 cris: Fixup last users of irq_chip->typename
In reply to Thomas GleixnerThe typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
--- arch/cris/arch-v10/kernel/irq.c | 2 +- arch/cris/arch-v32/kernel/irq.c | 2 +- arch/cris/kernel/irq.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/cris/arch-v10/kernel/irq.c +1 -1
@@ -133,7 +133,7 @@ static void end_crisv10_irq(unsigned int }static struct irq_chip crisv10_irq_type = { - .typename ="CRISv10" , + .name ="CRISv10" , .startup = startup_crisv10_irq, .shutdown = shutdown_crisv10_irq, .enable = enable_crisv10_irq,
arch/cris/arch-v32/kernel/irq.c +1 -1
@@ -336,7 +336,7 @@ int set_affinity_crisv32_irq(unsigned in }static struct irq_chip crisv32_irq_type = { - .typename ="CRISv32" , + .name ="CRISv32" , .startup = startup_crisv32_irq, .shutdown = shutdown_crisv32_irq, .enable = enable_crisv32_irq,
arch/cris/kernel/irq.c +1 -1
@@ -63,7 +63,7 @@ int show_interrupts(struct seq_file *p,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)
Re: [patch 10/13] cris: Fixup last users of irq_chip->typename
Quoted 2 lines · Thomas Gleixner
The typename member of struct
irq_chipwas kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
Looks good, should I take this through the CRIS-tree? Otherwise, here's my
Quoted 4 lines
Signed-off-by Thomas Gleixner <[email protected]>Cc Mikael Starvik <[email protected]>Cc Jesper Nilsson <[email protected]>
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper_at_jni.nu
Re: [patch 10/13] cris: Fixup last users of irq_chip->typename
Quoted 5 lines · Jesper Nilsson
Quoted 2 lines · Thomas Gleixner
The typename member of struct
irq_chipwas kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.Looks good, should I take this through the CRIS-tree? Otherwise, here's my
Please push it through your tree.
Thanks,
tglx
PATCH 11/13 arm: Fixup last users of irq_chip->typename
In reply to Thomas GleixnerAn embedded and charset-unspecified text was scrubbed...
Name: arm-replace-obsolete-typename.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20091117/d08402a9/attachment.el>
PATCH 12/13 alpha: Fixup last users of irq_chip->typename
In reply to Thomas GleixnerThe typename member of struct irq_chip was kept for migration purposes and is obsolete since more than 2 years. Fix up the leftovers.
--- arch/alpha/kernel/irq.c | 2 +- arch/alpha/kernel/irq_alpha.c | 2 +- arch/alpha/kernel/irq_i8259.c | 2 +- arch/alpha/kernel/irq_pyxis.c | 2 +- arch/alpha/kernel/irq_srm.c | 2 +- arch/alpha/kernel/sys_alcor.c | 2 +- arch/alpha/kernel/sys_cabriolet.c | 2 +- arch/alpha/kernel/sys_dp264.c | 4 ++-- arch/alpha/kernel/sys_eb64p.c | 2 +- arch/alpha/kernel/sys_eiger.c | 2 +- arch/alpha/kernel/sys_jensen.c | 2 +- arch/alpha/kernel/sys_marvel.c | 6 +++--- arch/alpha/kernel/sys_mikasa.c | 2 +- arch/alpha/kernel/sys_noritake.c | 2 +- arch/alpha/kernel/sys_rawhide.c | 2 +- arch/alpha/kernel/sys_rx164.c | 2 +- arch/alpha/kernel/sys_sable.c | 2 +- arch/alpha/kernel/sys_takara.c | 2 +- arch/alpha/kernel/sys_titan.c | 2 +- arch/alpha/kernel/sys_wildfire.c | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-)
arch/alpha/kernel/irq.c +1 -1
@@ -92,7 +92,7 @@ show_interrupts(struct seq_file *p, voidfor_each_online_cpu (j)seq_printf (p,"%10u " ,kstat_irqs_cpu (irq, j));#endif -seq_printf (p," %14s" , irq_desc[irq].chip->typename); +seq_printf (p," %14s" , irq_desc[irq].chip->name);seq_printf (p," %c%s" , (action->flags &IRQF_DISABLED )?'+' :' ' , action->name);
arch/alpha/kernel/irq_alpha.c +1 -1
@@ -228,7 +228,7 @@ struct irqaction timer_irqaction = { };static struct irq_chip rtc_irq_type = { - .typename ="RTC" , + .name ="RTC" , .startup = rtc_startup, .shutdown = rtc_enable_disable, .enable = rtc_enable_disable,
arch/alpha/kernel/irq_i8259.c +1 -1
@@ -84,7 +84,7 @@ i8259a_end_irq(unsigned int irq) }struct irq_chip i8259a_irq_type = { - .typename ="XT-PIC" , + .name ="XT-PIC" , .startup = i8259a_startup_irq, .shutdown = i8259a_disable_irq, .enable = i8259a_enable_irq,
arch/alpha/kernel/irq_pyxis.c +1 -1
@@ -71,7 +71,7 @@ pyxis_mask_and_ack_irq(unsigned int irq) }static struct irq_chip pyxis_irq_type = { - .typename ="PYXIS" , + .name ="PYXIS" , .startup = pyxis_startup_irq, .shutdown = pyxis_disable_irq, .enable = pyxis_enable_irq,
arch/alpha/kernel/irq_srm.c +1 -1
@@ -49,7 +49,7 @@ srm_end_irq(unsigned int irq)/* Handle interrupts from the SRM, assuming no additional weirdness. */ static struct irq_chip srm_irq_type = { - .typename ="SRM" , + .name ="SRM" , .startup = srm_startup_irq, .shutdown = srm_disable_irq, .enable = srm_enable_irq,
arch/alpha/kernel/sys_alcor.c +1 -1
@@ -90,7 +90,7 @@ alcor_end_irq(unsigned int irq) }static struct irq_chip alcor_irq_type = { - .typename ="ALCOR" , + .name ="ALCOR" , .startup = alcor_startup_irq, .shutdown = alcor_disable_irq, .enable = alcor_enable_irq,
arch/alpha/kernel/sys_cabriolet.c +1 -1
@@ -72,7 +72,7 @@ cabriolet_end_irq(unsigned int irq) }static struct irq_chip cabriolet_irq_type = { - .typename ="CABRIOLET" , + .name ="CABRIOLET" , .startup = cabriolet_startup_irq, .shutdown = cabriolet_disable_irq, .enable = cabriolet_enable_irq,
arch/alpha/kernel/sys_dp264.c +2 -2
@@ -199,7 +199,7 @@ clipper_set_affinity(unsigned int irq, c }static struct irq_chip dp264_irq_type = { - .typename ="DP264" , + .name ="DP264" , .startup = dp264_startup_irq, .shutdown = dp264_disable_irq, .enable = dp264_enable_irq,
@@ -210,7 +210,7 @@ static struct irq_chip dp264_irq_type = };static struct irq_chip clipper_irq_type = { - .typename ="CLIPPER" , + .name ="CLIPPER" , .startup = clipper_startup_irq, .shutdown = clipper_disable_irq, .enable = clipper_enable_irq,
arch/alpha/kernel/sys_eb64p.c +1 -1
@@ -70,7 +70,7 @@ eb64p_end_irq(unsigned int irq) }static struct irq_chip eb64p_irq_type = { - .typename ="EB64P" , + .name ="EB64P" , .startup = eb64p_startup_irq, .shutdown = eb64p_disable_irq, .enable = eb64p_enable_irq,
arch/alpha/kernel/sys_eiger.c +1 -1
@@ -81,7 +81,7 @@ eiger_end_irq(unsigned int irq) }static struct irq_chip eiger_irq_type = { - .typename ="EIGER" , + .name ="EIGER" , .startup = eiger_startup_irq, .shutdown = eiger_disable_irq, .enable = eiger_enable_irq,
arch/alpha/kernel/sys_jensen.c +1 -1
@@ -119,7 +119,7 @@ jensen_local_end(unsigned int irq) }static struct irq_chip jensen_local_irq_type = { - .typename ="LOCAL" , + .name ="LOCAL" , .startup = jensen_local_startup, .shutdown = jensen_local_shutdown, .enable = jensen_local_enable,
arch/alpha/kernel/sys_marvel.c +3 -3
@@ -170,7 +170,7 @@ marvel_irq_noop_return(unsigned int irq) }static struct irq_chip marvel_legacy_irq_type = { - .typename ="LEGACY" , + .name ="LEGACY" , .startup = marvel_irq_noop_return, .shutdown = marvel_irq_noop, .enable = marvel_irq_noop,
@@ -180,7 +180,7 @@ static struct irq_chip marvel_legacy_irq };static struct irq_chip io7_lsi_irq_type = { - .typename ="LSI" , + .name ="LSI" , .startup = io7_startup_irq, .shutdown = io7_disable_irq, .enable = io7_enable_irq,
@@ -190,7 +190,7 @@ static struct irq_chip io7_lsi_irq_type };static struct irq_chip io7_msi_irq_type = { - .typename ="MSI" , + .name ="MSI" , .startup = io7_startup_irq, .shutdown = io7_disable_irq, .enable = io7_enable_irq,
arch/alpha/kernel/sys_mikasa.c +1 -1
@@ -69,7 +69,7 @@ mikasa_end_irq(unsigned int irq) }static struct irq_chip mikasa_irq_type = { - .typename ="MIKASA" , + .name ="MIKASA" , .startup = mikasa_startup_irq, .shutdown = mikasa_disable_irq, .enable = mikasa_enable_irq,
arch/alpha/kernel/sys_noritake.c +1 -1
@@ -74,7 +74,7 @@ noritake_end_irq(unsigned int irq) }static struct irq_chip noritake_irq_type = { - .typename ="NORITAKE" , + .name ="NORITAKE" , .startup = noritake_startup_irq, .shutdown = noritake_disable_irq, .enable = noritake_enable_irq,
arch/alpha/kernel/sys_rawhide.c +1 -1
@@ -136,7 +136,7 @@ rawhide_end_irq(unsigned int irq) }static struct irq_chip rawhide_irq_type = { - .typename ="RAWHIDE" , + .name ="RAWHIDE" , .startup = rawhide_startup_irq, .shutdown = rawhide_disable_irq, .enable = rawhide_enable_irq,
arch/alpha/kernel/sys_rx164.c +1 -1
@@ -73,7 +73,7 @@ rx164_end_irq(unsigned int irq) }static struct irq_chip rx164_irq_type = { - .typename ="RX164" , + .name ="RX164" , .startup = rx164_startup_irq, .shutdown = rx164_disable_irq, .enable = rx164_enable_irq,
arch/alpha/kernel/sys_sable.c +1 -1
@@ -502,7 +502,7 @@ sable_lynx_mask_and_ack_irq(unsigned int }static struct irq_chip sable_lynx_irq_type = { - .typename ="SABLE/LYNX" , + .name ="SABLE/LYNX" , .startup = sable_lynx_startup_irq, .shutdown = sable_lynx_disable_irq, .enable = sable_lynx_enable_irq,
arch/alpha/kernel/sys_takara.c +1 -1
@@ -75,7 +75,7 @@ takara_end_irq(unsigned int irq) }static struct irq_chip takara_irq_type = { - .typename ="TAKARA" , + .name ="TAKARA" , .startup = takara_startup_irq, .shutdown = takara_disable_irq, .enable = takara_enable_irq,
arch/alpha/kernel/sys_titan.c +1 -1
@@ -195,7 +195,7 @@ init_titan_irqs(struct irq_chip * ops, i }static struct irq_chip titan_irq_type = { - .typename ="TITAN" , + .name ="TITAN" , .startup = titan_startup_irq, .shutdown = titan_disable_irq, .enable = titan_enable_irq,
arch/alpha/kernel/sys_wildfire.c +1 -1
@@ -158,7 +158,7 @@ wildfire_end_irq(unsigned int irq) }static struct irq_chip wildfire_irq_type = { - .typename ="WILDFIRE" , + .name ="WILDFIRE" , .startup = wildfire_startup_irq, .shutdown = wildfire_disable_irq, .enable = wildfire_enable_irq,
Matt Turner
maintainerRe: [patch 12/13] alpha: Fixup last users of irq_chip->typename
On Tue, Nov 17, 2009 at 5:51 PM, Thomas Gleixner <[email protected]> wrote:> 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: Thomas Gleixner <[email protected]>> Cc: Richard Henderson <[email protected]>> Cc: [email protected]> ---> arch/alpha/kernel/irq.c | 2 +-> arch/alpha/kernel/irq_alpha.c | 2 +-> arch/alpha/kernel/irq_i8259.c | 2 +-> arch/alpha/kernel/irq_pyxis.c | 2 +-> arch/alpha/kernel/irq_srm.c | 2 +-> arch/alpha/kernel/sys_alcor.c | 2 +-> arch/alpha/kernel/sys_cabriolet.c | 2 +-> arch/alpha/kernel/sys_dp264.c | 4 ++--> arch/alpha/kernel/sys_eb64p.c | 2 +-> arch/alpha/kernel/sys_eiger.c | 2 +-> arch/alpha/kernel/sys_jensen.c | 2 +-> arch/alpha/kernel/sys_marvel.c | 6 +++---> arch/alpha/kernel/sys_mikasa.c | 2 +-> arch/alpha/kernel/sys_noritake.c | 2 +-> arch/alpha/kernel/sys_rawhide.c | 2 +-> arch/alpha/kernel/sys_rx164.c | 2 +-> arch/alpha/kernel/sys_sable.c | 2 +-> arch/alpha/kernel/sys_takara.c | 2 +-> arch/alpha/kernel/sys_titan.c | 2 +-> arch/alpha/kernel/sys_wildfire.c | 2 +-> 20 files changed, 23 insertions(+), 23 deletions(-)>> Index: linux-2.6/arch/alpha/kernel/irq.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/irq.c> +++ linux-2.6/arch/alpha/kernel/irq.c> @@ -92,7 +92,7 @@ show_interrupts(struct seq_file *p, void> for_each_online_cpu(j)> seq_printf(p, "%10u ", kstat_irqs_cpu(irq, j));> #endif> - seq_printf(p, " %14s", irq_desc[irq].chip->typename);> + seq_printf(p, " %14s", irq_desc[irq].chip->name);> seq_printf(p, " %c%s",> (action->flags & IRQF_DISABLED)?'+':' ',> action->name);> Index: linux-2.6/arch/alpha/kernel/irq_alpha.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/irq_alpha.c> +++ linux-2.6/arch/alpha/kernel/irq_alpha.c> @@ -228,7 +228,7 @@ struct irqaction timer_irqaction = {> };>> static struct irq_chip rtc_irq_type = {> - .typename = "RTC",> + .name = "RTC",> .startup = rtc_startup,> .shutdown = rtc_enable_disable,> .enable = rtc_enable_disable,> Index: linux-2.6/arch/alpha/kernel/irq_i8259.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/irq_i8259.c> +++ linux-2.6/arch/alpha/kernel/irq_i8259.c> @@ -84,7 +84,7 @@ i8259a_end_irq(unsigned int irq)> }>> struct irq_chip i8259a_irq_type = {> - .typename = "XT-PIC",> + .name = "XT-PIC",> .startup = i8259a_startup_irq,> .shutdown = i8259a_disable_irq,> .enable = i8259a_enable_irq,> Index: linux-2.6/arch/alpha/kernel/irq_pyxis.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/irq_pyxis.c> +++ linux-2.6/arch/alpha/kernel/irq_pyxis.c> @@ -71,7 +71,7 @@ pyxis_mask_and_ack_irq(unsigned int irq)> }>> static struct irq_chip pyxis_irq_type = {> - .typename = "PYXIS",> + .name = "PYXIS",> .startup = pyxis_startup_irq,> .shutdown = pyxis_disable_irq,> .enable = pyxis_enable_irq,> Index: linux-2.6/arch/alpha/kernel/irq_srm.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/irq_srm.c> +++ linux-2.6/arch/alpha/kernel/irq_srm.c> @@ -49,7 +49,7 @@ srm_end_irq(unsigned int irq)>> /* Handle interrupts from the SRM, assuming no additional weirdness. */> static struct irq_chip srm_irq_type = {> - .typename = "SRM",> + .name = "SRM",> .startup = srm_startup_irq,> .shutdown = srm_disable_irq,> .enable = srm_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_alcor.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_alcor.c> +++ linux-2.6/arch/alpha/kernel/sys_alcor.c> @@ -90,7 +90,7 @@ alcor_end_irq(unsigned int irq)> }>> static struct irq_chip alcor_irq_type = {> - .typename = "ALCOR",> + .name = "ALCOR",> .startup = alcor_startup_irq,> .shutdown = alcor_disable_irq,> .enable = alcor_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_cabriolet.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_cabriolet.c> +++ linux-2.6/arch/alpha/kernel/sys_cabriolet.c> @@ -72,7 +72,7 @@ cabriolet_end_irq(unsigned int irq)> }>> static struct irq_chip cabriolet_irq_type = {> - .typename = "CABRIOLET",> + .name = "CABRIOLET",> .startup = cabriolet_startup_irq,> .shutdown = cabriolet_disable_irq,> .enable = cabriolet_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_dp264.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_dp264.c> +++ linux-2.6/arch/alpha/kernel/sys_dp264.c> @@ -199,7 +199,7 @@ clipper_set_affinity(unsigned int irq, c> }>> static struct irq_chip dp264_irq_type = {> - .typename = "DP264",> + .name = "DP264",> .startup = dp264_startup_irq,> .shutdown = dp264_disable_irq,> .enable = dp264_enable_irq,> @@ -210,7 +210,7 @@ static struct irq_chip dp264_irq_type => };>> static struct irq_chip clipper_irq_type = {> - .typename = "CLIPPER",> + .name = "CLIPPER",> .startup = clipper_startup_irq,> .shutdown = clipper_disable_irq,> .enable = clipper_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_eb64p.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_eb64p.c> +++ linux-2.6/arch/alpha/kernel/sys_eb64p.c> @@ -70,7 +70,7 @@ eb64p_end_irq(unsigned int irq)> }>> static struct irq_chip eb64p_irq_type = {> - .typename = "EB64P",> + .name = "EB64P",> .startup = eb64p_startup_irq,> .shutdown = eb64p_disable_irq,> .enable = eb64p_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_eiger.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_eiger.c> +++ linux-2.6/arch/alpha/kernel/sys_eiger.c> @@ -81,7 +81,7 @@ eiger_end_irq(unsigned int irq)> }>> static struct irq_chip eiger_irq_type = {> - .typename = "EIGER",> + .name = "EIGER",> .startup = eiger_startup_irq,> .shutdown = eiger_disable_irq,> .enable = eiger_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_jensen.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_jensen.c> +++ linux-2.6/arch/alpha/kernel/sys_jensen.c> @@ -119,7 +119,7 @@ jensen_local_end(unsigned int irq)> }>> static struct irq_chip jensen_local_irq_type = {> - .typename = "LOCAL",> + .name = "LOCAL",> .startup = jensen_local_startup,> .shutdown = jensen_local_shutdown,> .enable = jensen_local_enable,> Index: linux-2.6/arch/alpha/kernel/sys_marvel.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_marvel.c> +++ linux-2.6/arch/alpha/kernel/sys_marvel.c> @@ -170,7 +170,7 @@ marvel_irq_noop_return(unsigned int irq)> }>> static struct irq_chip marvel_legacy_irq_type = {> - .typename = "LEGACY",> + .name = "LEGACY",> .startup = marvel_irq_noop_return,> .shutdown = marvel_irq_noop,> .enable = marvel_irq_noop,> @@ -180,7 +180,7 @@ static struct irq_chip marvel_legacy_irq> };>> static struct irq_chip io7_lsi_irq_type = {> - .typename = "LSI",> + .name = "LSI",> .startup = io7_startup_irq,> .shutdown = io7_disable_irq,> .enable = io7_enable_irq,> @@ -190,7 +190,7 @@ static struct irq_chip io7_lsi_irq_type> };>> static struct irq_chip io7_msi_irq_type = {> - .typename = "MSI",> + .name = "MSI",> .startup = io7_startup_irq,> .shutdown = io7_disable_irq,> .enable = io7_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_mikasa.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_mikasa.c> +++ linux-2.6/arch/alpha/kernel/sys_mikasa.c> @@ -69,7 +69,7 @@ mikasa_end_irq(unsigned int irq)> }>> static struct irq_chip mikasa_irq_type = {> - .typename = "MIKASA",> + .name = "MIKASA",> .startup = mikasa_startup_irq,> .shutdown = mikasa_disable_irq,> .enable = mikasa_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_noritake.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_noritake.c> +++ linux-2.6/arch/alpha/kernel/sys_noritake.c> @@ -74,7 +74,7 @@ noritake_end_irq(unsigned int irq)> }>> static struct irq_chip noritake_irq_type = {> - .typename = "NORITAKE",> + .name = "NORITAKE",> .startup = noritake_startup_irq,> .shutdown = noritake_disable_irq,> .enable = noritake_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_rawhide.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_rawhide.c> +++ linux-2.6/arch/alpha/kernel/sys_rawhide.c> @@ -136,7 +136,7 @@ rawhide_end_irq(unsigned int irq)> }>> static struct irq_chip rawhide_irq_type = {> - .typename = "RAWHIDE",> + .name = "RAWHIDE",> .startup = rawhide_startup_irq,> .shutdown = rawhide_disable_irq,> .enable = rawhide_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_rx164.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_rx164.c> +++ linux-2.6/arch/alpha/kernel/sys_rx164.c> @@ -73,7 +73,7 @@ rx164_end_irq(unsigned int irq)> }>> static struct irq_chip rx164_irq_type = {> - .typename = "RX164",> + .name = "RX164",> .startup = rx164_startup_irq,> .shutdown = rx164_disable_irq,> .enable = rx164_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_sable.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_sable.c> +++ linux-2.6/arch/alpha/kernel/sys_sable.c> @@ -502,7 +502,7 @@ sable_lynx_mask_and_ack_irq(unsigned int> }>> static struct irq_chip sable_lynx_irq_type = {> - .typename = "SABLE/LYNX",> + .name = "SABLE/LYNX",> .startup = sable_lynx_startup_irq,> .shutdown = sable_lynx_disable_irq,> .enable = sable_lynx_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_takara.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_takara.c> +++ linux-2.6/arch/alpha/kernel/sys_takara.c> @@ -75,7 +75,7 @@ takara_end_irq(unsigned int irq)> }>> static struct irq_chip takara_irq_type = {> - .typename = "TAKARA",> + .name = "TAKARA",> .startup = takara_startup_irq,> .shutdown = takara_disable_irq,> .enable = takara_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_titan.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_titan.c> +++ linux-2.6/arch/alpha/kernel/sys_titan.c> @@ -195,7 +195,7 @@ init_titan_irqs(struct irq_chip * ops, i> }>> static struct irq_chip titan_irq_type = {> - .typename = "TITAN",> + .name = "TITAN",> .startup = titan_startup_irq,> .shutdown = titan_disable_irq,> .enable = titan_enable_irq,> Index: linux-2.6/arch/alpha/kernel/sys_wildfire.c> ===================================================================> --- linux-2.6.orig/arch/alpha/kernel/sys_wildfire.c> +++ linux-2.6/arch/alpha/kernel/sys_wildfire.c> @@ -158,7 +158,7 @@ wildfire_end_irq(unsigned int irq)> }>> static struct irq_chip wildfire_irq_type = {> - .typename = "WILDFIRE",> + .name = "WILDFIRE",> .startup = wildfire_startup_irq,> .shutdown = wildfire_disable_irq,> .enable = wildfire_enable_irq,>>> -- Thanks. Applied to alpha-2.6.git.
Mattÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ¥Šwÿº{.nÇ+‰·¥Š{±þG«�éÿŠ{ayºÊ‡Ú™ë,j¢f£¢·hš�ï�êÿ‘êçz_è®(階ŠÝ¢j"�ú¶m§ÿÿ¾«þG«�éÿ¢¸?™¨èÚ&£ø§~�á¶iO•æ¬z·švØ^¶m§ÿÿÃÿ¶ìÿ¢¸?–I¥
PATCH 13/13 genirq: Remove typename from struct irq_chip
In reply to Thomas GleixnerThe last users of the migration helper are gone. Remove it.
--- include/linux/irq.h | 6 ------ kernel/irq/chip.c | 2 -- 2 files changed, 8 deletions(-)
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
@@ -310,8 +310,6 @@ void irq_chip_set_defaults(struct irq_chif (!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; }