diff options
| author | Anton Blanchard <anton@samba.org> | 2010-01-31 15:33:41 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-16 22:02:48 -0500 |
| commit | fc380c0c8a17bc2bd2d9d7fb41d4a88c3e618db2 (patch) | |
| tree | dcd1060477e4016a1cb4f1711b1a865e1e7354a9 | |
| parent | c86845ede8b643ca025aec277dec1892d0ccac01 (diff) | |
powerpc: Remove whitespace in irq chip name fields
Now we use printf style alignment there is no need to manually space
these fields.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/beat_interrupt.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/interrupt.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/spider-pic.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/irq.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/powermac/pic.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/pseries/xics.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/cpm1.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/cpm2_pic.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/fsl_msi.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/i8259.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/ipic.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/mpc8xx_pic.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/mpic_pasemi_msi.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/uic.c | 2 |
17 files changed, 20 insertions, 20 deletions
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c index da9b20a63769..4ecf4cf9a51b 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) | |||
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | static struct irq_chip cpld_pic = { | 81 | static struct irq_chip cpld_pic = { |
| 82 | .name = " CPLD PIC ", | 82 | .name = "CPLD PIC", |
| 83 | .mask = cpld_mask_irq, | 83 | .mask = cpld_mask_irq, |
| 84 | .ack = cpld_mask_irq, | 84 | .ack = cpld_mask_irq, |
| 85 | .unmask = cpld_unmask_irq, | 85 | .unmask = cpld_unmask_irq, |
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c index e5da5f62b24a..42e87f08aa01 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, | |||
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | static struct irq_chip socrates_fpga_pic_chip = { | 234 | static struct irq_chip socrates_fpga_pic_chip = { |
| 235 | .name = " FPGA-PIC ", | 235 | .name = "FPGA-PIC", |
| 236 | .ack = socrates_fpga_pic_ack, | 236 | .ack = socrates_fpga_pic_ack, |
| 237 | .mask = socrates_fpga_pic_mask, | 237 | .mask = socrates_fpga_pic_mask, |
| 238 | .mask_ack = socrates_fpga_pic_mask_ack, | 238 | .mask_ack = socrates_fpga_pic_mask_ack, |
diff --git a/arch/powerpc/platforms/cell/beat_interrupt.c b/arch/powerpc/platforms/cell/beat_interrupt.c index 36052a9ebcda..8d29290f6070 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) | |||
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | static struct irq_chip beatic_pic = { | 112 | static struct irq_chip beatic_pic = { |
| 113 | .name = " CELL-BEAT ", | 113 | .name = "CELL-BEAT", |
| 114 | .unmask = beatic_unmask_irq, | 114 | .unmask = beatic_unmask_irq, |
| 115 | .mask = beatic_mask_irq, | 115 | .mask = beatic_mask_irq, |
| 116 | .eoi = beatic_end_irq, | 116 | .eoi = beatic_end_irq, |
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c index 6829cf7e2bda..10eb1a443626 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) | |||
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | static struct irq_chip iic_chip = { | 90 | static struct irq_chip iic_chip = { |
| 91 | .name = " CELL-IIC ", | 91 | .name = "CELL-IIC", |
| 92 | .mask = iic_mask, | 92 | .mask = iic_mask, |
| 93 | .unmask = iic_unmask, | 93 | .unmask = iic_unmask, |
| 94 | .eoi = iic_eoi, | 94 | .eoi = iic_eoi, |
| @@ -133,7 +133,7 @@ static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc) | |||
| 133 | 133 | ||
| 134 | 134 | ||
| 135 | static struct irq_chip iic_ioexc_chip = { | 135 | static struct irq_chip iic_ioexc_chip = { |
| 136 | .name = " CELL-IOEX", | 136 | .name = "CELL-IOEX", |
| 137 | .mask = iic_mask, | 137 | .mask = iic_mask, |
| 138 | .unmask = iic_unmask, | 138 | .unmask = iic_unmask, |
| 139 | .eoi = iic_ioexc_eoi, | 139 | .eoi = iic_ioexc_eoi, |
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c index 01244f254a11..5876e888e412 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) | |||
| 168 | } | 168 | } |
| 169 | 169 | ||
| 170 | static struct irq_chip spider_pic = { | 170 | static struct irq_chip spider_pic = { |
| 171 | .name = " SPIDER ", | 171 | .name = "SPIDER", |
| 172 | .unmask = spider_unmask_irq, | 172 | .unmask = spider_unmask_irq, |
| 173 | .mask = spider_mask_irq, | 173 | .mask = spider_mask_irq, |
| 174 | .ack = spider_ack_irq, | 174 | .ack = spider_ack_irq, |
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c index 86c4b29eea89..ba446bf355a9 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) | |||
| 273 | } | 273 | } |
| 274 | 274 | ||
| 275 | static struct irq_chip iseries_pic = { | 275 | static struct irq_chip iseries_pic = { |
| 276 | .name = "iSeries irq controller", | 276 | .name = "iSeries", |
| 277 | .startup = iseries_startup_IRQ, | 277 | .startup = iseries_startup_IRQ, |
| 278 | .shutdown = iseries_shutdown_IRQ, | 278 | .shutdown = iseries_shutdown_IRQ, |
| 279 | .unmask = iseries_enable_IRQ, | 279 | .unmask = iseries_enable_IRQ, |
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index 09e827296276..3b62896f9a5b 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) | |||
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | static struct irq_chip pmac_pic = { | 197 | static struct irq_chip pmac_pic = { |
| 198 | .name = " PMAC-PIC ", | 198 | .name = "PMAC-PIC", |
| 199 | .startup = pmac_startup_irq, | 199 | .startup = pmac_startup_irq, |
| 200 | .mask = pmac_mask_irq, | 200 | .mask = pmac_mask_irq, |
| 201 | .ack = pmac_ack_irq, | 201 | .ack = pmac_ack_irq, |
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index 41374e830eb1..4ca641042ec3 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c | |||
| @@ -424,7 +424,7 @@ static int xics_set_affinity(unsigned int virq, const struct cpumask *cpumask) | |||
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | static struct irq_chip xics_pic_direct = { | 426 | static struct irq_chip xics_pic_direct = { |
| 427 | .name = " XICS ", | 427 | .name = "XICS", |
| 428 | .startup = xics_startup, | 428 | .startup = xics_startup, |
| 429 | .mask = xics_mask_irq, | 429 | .mask = xics_mask_irq, |
| 430 | .unmask = xics_unmask_irq, | 430 | .unmask = xics_unmask_irq, |
| @@ -433,7 +433,7 @@ static struct irq_chip xics_pic_direct = { | |||
| 433 | }; | 433 | }; |
| 434 | 434 | ||
| 435 | static struct irq_chip xics_pic_lpar = { | 435 | static struct irq_chip xics_pic_lpar = { |
| 436 | .name = " XICS ", | 436 | .name = "XICS", |
| 437 | .startup = xics_startup, | 437 | .startup = xics_startup, |
| 438 | .mask = xics_mask_irq, | 438 | .mask = xics_mask_irq, |
| 439 | .unmask = xics_unmask_irq, | 439 | .unmask = xics_unmask_irq, |
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c index a4b41dbde128..ecad10d4e928 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) | |||
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | static struct irq_chip cpm_pic = { | 79 | static struct irq_chip cpm_pic = { |
| 80 | .name = " CPM PIC ", | 80 | .name = "CPM PIC", |
| 81 | .mask = cpm_mask_irq, | 81 | .mask = cpm_mask_irq, |
| 82 | .unmask = cpm_unmask_irq, | 82 | .unmask = cpm_unmask_irq, |
| 83 | .eoi = cpm_end_irq, | 83 | .eoi = cpm_end_irq, |
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c index 1709ac5aac7c..fcea4ff825dd 100644 --- a/arch/powerpc/sysdev/cpm2_pic.c +++ b/arch/powerpc/sysdev/cpm2_pic.c | |||
| @@ -198,7 +198,7 @@ err_sense: | |||
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | static struct irq_chip cpm2_pic = { | 200 | static struct irq_chip cpm2_pic = { |
| 201 | .name = " CPM2 SIU ", | 201 | .name = "CPM2 SIU", |
| 202 | .mask = cpm2_mask_irq, | 202 | .mask = cpm2_mask_irq, |
| 203 | .unmask = cpm2_unmask_irq, | 203 | .unmask = cpm2_unmask_irq, |
| 204 | .ack = cpm2_ack, | 204 | .ack = cpm2_ack, |
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c index c6e11b077108..e094367d7739 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 = { | |||
| 47 | .mask = mask_msi_irq, | 47 | .mask = mask_msi_irq, |
| 48 | .unmask = unmask_msi_irq, | 48 | .unmask = unmask_msi_irq, |
| 49 | .ack = fsl_msi_end_irq, | 49 | .ack = fsl_msi_end_irq, |
| 50 | .name = " FSL-MSI ", | 50 | .name = "FSL-MSI", |
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | static int fsl_msi_host_map(struct irq_host *h, unsigned int virq, | 53 | 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 0a55db8a5a29..d32581764bde 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) | |||
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | static struct irq_chip i8259_pic = { | 137 | static struct irq_chip i8259_pic = { |
| 138 | .name = " i8259 ", | 138 | .name = "i8259", |
| 139 | .mask = i8259_mask_irq, | 139 | .mask = i8259_mask_irq, |
| 140 | .disable = i8259_mask_irq, | 140 | .disable = i8259_mask_irq, |
| 141 | .unmask = i8259_unmask_irq, | 141 | .unmask = i8259_unmask_irq, |
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c index 28cdddd2f89e..16486716970a 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) | |||
| 660 | 660 | ||
| 661 | /* level interrupts and edge interrupts have different ack operations */ | 661 | /* level interrupts and edge interrupts have different ack operations */ |
| 662 | static struct irq_chip ipic_level_irq_chip = { | 662 | static struct irq_chip ipic_level_irq_chip = { |
| 663 | .name = " IPIC ", | 663 | .name = "IPIC", |
| 664 | .unmask = ipic_unmask_irq, | 664 | .unmask = ipic_unmask_irq, |
| 665 | .mask = ipic_mask_irq, | 665 | .mask = ipic_mask_irq, |
| 666 | .mask_ack = ipic_mask_irq, | 666 | .mask_ack = ipic_mask_irq, |
| @@ -668,7 +668,7 @@ static struct irq_chip ipic_level_irq_chip = { | |||
| 668 | }; | 668 | }; |
| 669 | 669 | ||
| 670 | static struct irq_chip ipic_edge_irq_chip = { | 670 | static struct irq_chip ipic_edge_irq_chip = { |
| 671 | .name = " IPIC ", | 671 | .name = "IPIC", |
| 672 | .unmask = ipic_unmask_irq, | 672 | .unmask = ipic_unmask_irq, |
| 673 | .mask = ipic_mask_irq, | 673 | .mask = ipic_mask_irq, |
| 674 | .mask_ack = ipic_mask_irq_and_ack, | 674 | .mask_ack = ipic_mask_irq_and_ack, |
diff --git a/arch/powerpc/sysdev/mpc8xx_pic.c b/arch/powerpc/sysdev/mpc8xx_pic.c index 69bd6f4dff83..8c27d261aba8 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) | |||
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | static struct irq_chip mpc8xx_pic = { | 96 | static struct irq_chip mpc8xx_pic = { |
| 97 | .name = " MPC8XX SIU ", | 97 | .name = "MPC8XX SIU", |
| 98 | .unmask = mpc8xx_unmask_irq, | 98 | .unmask = mpc8xx_unmask_irq, |
| 99 | .mask = mpc8xx_mask_irq, | 99 | .mask = mpc8xx_mask_irq, |
| 100 | .ack = mpc8xx_ack, | 100 | .ack = mpc8xx_ack, |
diff --git a/arch/powerpc/sysdev/mpic_pasemi_msi.c b/arch/powerpc/sysdev/mpic_pasemi_msi.c index 0f6ab06f8474..3b6a9a43718f 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 = { | |||
| 60 | .eoi = mpic_end_irq, | 60 | .eoi = mpic_end_irq, |
| 61 | .set_type = mpic_set_irq_type, | 61 | .set_type = mpic_set_irq_type, |
| 62 | .set_affinity = mpic_set_affinity, | 62 | .set_affinity = mpic_set_affinity, |
| 63 | .name = "PASEMI-MSI ", | 63 | .name = "PASEMI-MSI", |
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| 66 | static int pasemi_msi_check_device(struct pci_dev *pdev, int nvec, int type) | 66 | static int pasemi_msi_check_device(struct pci_dev *pdev, int nvec, int type) |
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c index 5f0b0368a209..d927da893ec4 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) | |||
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | static struct irq_chip qe_ic_irq_chip = { | 239 | static struct irq_chip qe_ic_irq_chip = { |
| 240 | .name = " QEIC ", | 240 | .name = "QEIC", |
| 241 | .unmask = qe_ic_unmask_irq, | 241 | .unmask = qe_ic_unmask_irq, |
| 242 | .mask = qe_ic_mask_irq, | 242 | .mask = qe_ic_mask_irq, |
| 243 | .mask_ack = qe_ic_mask_irq, | 243 | .mask_ack = qe_ic_mask_irq, |
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c index 6f220a913e42..0038fb78f094 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) | |||
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | static struct irq_chip uic_irq_chip = { | 179 | static struct irq_chip uic_irq_chip = { |
| 180 | .name = " UIC ", | 180 | .name = "UIC", |
| 181 | .unmask = uic_unmask_irq, | 181 | .unmask = uic_unmask_irq, |
| 182 | .mask = uic_mask_irq, | 182 | .mask = uic_mask_irq, |
| 183 | .mask_ack = uic_mask_ack_irq, | 183 | .mask_ack = uic_mask_ack_irq, |
