diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-11-18 23:44:21 +0000 | 
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 14:32:45 +1100 | 
| commit | b27df67248d3ae61d7814f18e363954254935090 (patch) | |
| tree | bb8015be2cb1770500ed04f7e2cb62ab907a6c8e | |
| parent | 293cfa44c3a861d63c77923667206356c4756ae0 (diff) | |
| download | olio-linux-3.10-b27df67248d3ae61d7814f18e363954254935090.tar.xz olio-linux-3.10-b27df67248d3ae61d7814f18e363954254935090.zip  | |
powerpc: 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: Thomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
Acked-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
29 files changed, 39 insertions, 40 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index eba53923630..a31176ace02 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -223,7 +223,7 @@ int show_interrupts(struct seq_file *p, void *v)  #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      "); @@ -1112,8 +1112,8 @@ static int virq_debug_show(struct seq_file *m, void *private)  			seq_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); diff --git a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c index cd70ee1667f..da9b20a6376 100644 --- a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c +++ b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c @@ -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, diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c index 47802035874..85001a4cbdf 100644 --- a/arch/powerpc/platforms/52xx/media5200.c +++ b/arch/powerpc/platforms/52xx/media5200.c @@ -74,7 +74,7 @@ static void media5200_irq_mask(unsigned int virq)  }  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, diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c index bfbcd418e69..4d76b7f2336 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c @@ -149,7 +149,7 @@ static int mpc52xx_gpt_irq_set_type(unsigned int virq, unsigned int flow_type)  }  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, diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c index 480f806fd0a..a3122d163b6 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c @@ -220,7 +220,7 @@ static int mpc52xx_extirq_set_type(unsigned int virq, unsigned int flow_type)  }  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 int virq)  }  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(unsigned int virq)  }  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 int virq)  }  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, diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c index a682331ba0f..9d962d7c72c 100644 --- a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c @@ -69,7 +69,6 @@ static void pq2ads_pci_unmask_irq(unsigned int virq)  }  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, diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c index e59920aa666..37a2e5f60af 100644 --- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c +++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c @@ -232,7 +232,7 @@ static int socrates_fpga_pic_set_type(unsigned int virq,  }  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, diff --git a/arch/powerpc/platforms/86xx/gef_pic.c b/arch/powerpc/platforms/86xx/gef_pic.c index 978d6cb3751..e1d5d36995d 100644 --- a/arch/powerpc/platforms/86xx/gef_pic.c +++ b/arch/powerpc/platforms/86xx/gef_pic.c @@ -149,7 +149,7 @@ static void gef_pic_unmask(unsigned int virq)  }  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, diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c index a86c34b3bb8..96fe896f6df 100644 --- a/arch/powerpc/platforms/cell/axon_msi.c +++ b/arch/powerpc/platforms/cell/axon_msi.c @@ -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, diff --git a/arch/powerpc/platforms/cell/beat_interrupt.c b/arch/powerpc/platforms/cell/beat_interrupt.c index 4a2bbff5769..c3479a47d45 100644 --- a/arch/powerpc/platforms/cell/beat_interrupt.c +++ b/arch/powerpc/platforms/cell/beat_interrupt.c @@ -110,7 +110,7 @@ static void beatic_end_irq(unsigned int irq_plug)  }  static struct irq_chip beatic_pic = { -	.typename = " CELL-BEAT ", +	.name = " CELL-BEAT ",  	.unmask = beatic_unmask_irq,  	.mask = beatic_mask_irq,  	.eoi = beatic_end_irq, diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c index 882e47080e7..3b67afba3f9 100644 --- a/arch/powerpc/platforms/cell/interrupt.c +++ b/arch/powerpc/platforms/cell/interrupt.c @@ -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 int irq, struct irq_desc *desc)  static struct irq_chip iic_ioexc_chip = { -	.typename = " CELL-IOEX", +	.name = " CELL-IOEX",  	.mask = iic_mask,  	.unmask = iic_unmask,  	.eoi = iic_ioexc_eoi, diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c index 9dd63c5d11a..167dedaada7 100644 --- a/arch/powerpc/platforms/cell/spider-pic.c +++ b/arch/powerpc/platforms/cell/spider-pic.c @@ -168,7 +168,7 @@ static int spider_set_irq_type(unsigned int virq, unsigned int type)  }  static struct irq_chip spider_pic = { -	.typename = " SPIDER   ", +	.name = " SPIDER   ",  	.unmask = spider_unmask_irq,  	.mask = spider_mask_irq,  	.ack = spider_ack_irq, diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c index f8446ea3118..07762259c60 100644 --- a/arch/powerpc/platforms/iseries/irq.c +++ b/arch/powerpc/platforms/iseries/irq.c @@ -273,7 +273,7 @@ static void iseries_end_IRQ(unsigned int irq)  }  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, diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index 484d21e55c6..99d0b313e9a 100644 --- a/arch/powerpc/platforms/powermac/pic.c +++ b/arch/powerpc/platforms/powermac/pic.c @@ -195,7 +195,7 @@ static int pmac_retrigger(unsigned int virq)  }  static struct irq_chip pmac_pic = { -	.typename	= " PMAC-PIC ", +	.name		= " PMAC-PIC ",  	.startup	= pmac_startup_irq,  	.mask		= pmac_mask_irq,  	.ack		= pmac_ack_irq, diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c index 8ec5ccf76b1..59d9712d736 100644 --- a/arch/powerpc/platforms/ps3/interrupt.c +++ b/arch/powerpc/platforms/ps3/interrupt.c @@ -152,7 +152,7 @@ static void ps3_chip_eoi(unsigned int virq)   */  static struct irq_chip ps3_irq_chip = { -	.typename = "ps3", +	.name = "ps3",  	.mask = ps3_chip_mask,  	.unmask = ps3_chip_unmask,  	.eoi = ps3_chip_eoi, diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index 097e8a2a3c5..6592becd441 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c @@ -388,7 +388,7 @@ static int xics_set_affinity(unsigned int virq, const struct cpumask *cpumask)  }  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, diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c index 523537300ad..a4b41dbde12 100644 --- a/arch/powerpc/sysdev/cpm1.c +++ b/arch/powerpc/sysdev/cpm1.c @@ -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, diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c index 722cf72e190..059ea4e5e25 100644 --- a/arch/powerpc/sysdev/cpm2_pic.c +++ b/arch/powerpc/sysdev/cpm2_pic.c @@ -184,7 +184,7 @@ static int cpm2_set_irq_type(unsigned int virq, unsigned int flow_type)  }  static struct irq_chip cpm2_pic = { -	.typename = " CPM2 SIU ", +	.name = " CPM2 SIU ",  	.mask = cpm2_mask_irq,  	.unmask = cpm2_unmask_irq,  	.ack = cpm2_ack, diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c index 7174374f90f..62e50258cde 100644 --- a/arch/powerpc/sysdev/fsl_msi.c +++ b/arch/powerpc/sysdev/fsl_msi.c @@ -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, diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c index 78ed945453d..ba8f1f70899 100644 --- a/arch/powerpc/sysdev/i8259.c +++ b/arch/powerpc/sysdev/i8259.c @@ -135,7 +135,7 @@ static void i8259_unmask_irq(unsigned int irq_nr)  }  static struct irq_chip i8259_pic = { -	.typename	= " i8259    ", +	.name		= " i8259    ",  	.mask		= i8259_mask_irq,  	.disable	= i8259_mask_irq,  	.unmask		= i8259_unmask_irq, diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c index f042c1d6900..c89d78075ba 100644 --- a/arch/powerpc/sysdev/ipic.c +++ b/arch/powerpc/sysdev/ipic.c @@ -660,7 +660,7 @@ static int ipic_set_irq_type(unsigned int virq, unsigned int flow_type)  /* 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_chip = {  };  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, diff --git a/arch/powerpc/sysdev/mpc8xx_pic.c b/arch/powerpc/sysdev/mpc8xx_pic.c index 01179587df2..db0a712f607 100644 --- a/arch/powerpc/sysdev/mpc8xx_pic.c +++ b/arch/powerpc/sysdev/mpc8xx_pic.c @@ -94,7 +94,7 @@ static int mpc8xx_set_irq_type(unsigned int virq, unsigned int flow_type)  }  static struct irq_chip mpc8xx_pic = { -	.typename = " MPC8XX SIU ", +	.name = " MPC8XX SIU ",  	.unmask = mpc8xx_unmask_irq,  	.mask = mpc8xx_mask_irq,  	.ack = mpc8xx_ack, diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 4fd57ab956b..7a64bc5808d 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c @@ -1062,19 +1062,19 @@ struct mpic * __init mpic_alloc(struct device_node *node,  	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; diff --git a/arch/powerpc/sysdev/mpic_pasemi_msi.c b/arch/powerpc/sysdev/mpic_pasemi_msi.c index 656cb772b69..0f6ab06f847 100644 --- a/arch/powerpc/sysdev/mpic_pasemi_msi.c +++ b/arch/powerpc/sysdev/mpic_pasemi_msi.c @@ -60,7 +60,7 @@ static struct irq_chip mpic_pasemi_msi_chip = {  	.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) diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c index 0a8f5a9e87c..d3caf23e631 100644 --- a/arch/powerpc/sysdev/mpic_u3msi.c +++ b/arch/powerpc/sysdev/mpic_u3msi.c @@ -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) diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c index fc098744ad8..c1e17b3d398 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_ic.c +++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c @@ -237,7 +237,7 @@ static void qe_ic_mask_irq(unsigned int virq)  }  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, diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c index 02f600991dc..47769d2359d 100644 --- a/arch/powerpc/sysdev/tsi108_pci.c +++ b/arch/powerpc/sysdev/tsi108_pci.c @@ -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, diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c index cf97935863c..c907601e44d 100644 --- a/arch/powerpc/sysdev/uic.c +++ b/arch/powerpc/sysdev/uic.c @@ -177,7 +177,7 @@ static int uic_set_irq_type(unsigned int virq, unsigned int flow_type)  }  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, diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c index ab743718876..45eb225ec25 100644 --- a/arch/powerpc/sysdev/xilinx_intc.c +++ b/arch/powerpc/sysdev/xilinx_intc.c @@ -106,7 +106,7 @@ static void xilinx_intc_level_unmask(unsigned int virq)  }  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(unsigned int virq)  }  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,  |