diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2016-09-12 06:00:36 -0400 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2016-09-12 07:04:56 -0400 |
commit | 372095723a597f4d27f561abab9b3da4c8a33106 (patch) | |
tree | a6e2e78a4ea158de9b4b2af9a6ddee7fefa33d9f | |
parent | 43fa9ba632bd90b5cf63793a461e28df6af4387a (diff) |
EDAC: Remove NO_IRQ from powerpc-only drivers
We'd like to eventually remove NO_IRQ on powerpc, so remove usages of it
from powerpc-only drivers.
The pdata structs are kzalloc'ed, so we don't need to initialise those
to 0, we can just drop the assignments entirely.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Johannes Thumshirn <morbidrsa@gmail.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: linuxppc-dev@ozlabs.org
Link: http://lkml.kernel.org/r/1473674436-19467-1-git-send-email-mpe@ellerman.id.au
Signed-off-by: Borislav Petkov <bp@suse.de>
-rw-r--r-- | drivers/edac/mpc85xx_edac.c | 2 | ||||
-rw-r--r-- | drivers/edac/mv64x60_edac.c | 4 | ||||
-rw-r--r-- | drivers/edac/ppc4xx_edac.c | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 0a4020923684..ff0567526ee3 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c | |||
@@ -170,7 +170,6 @@ static int mpc85xx_pci_err_probe(struct platform_device *op) | |||
170 | 170 | ||
171 | pdata = pci->pvt_info; | 171 | pdata = pci->pvt_info; |
172 | pdata->name = "mpc85xx_pci_err"; | 172 | pdata->name = "mpc85xx_pci_err"; |
173 | pdata->irq = NO_IRQ; | ||
174 | 173 | ||
175 | plat_data = op->dev.platform_data; | 174 | plat_data = op->dev.platform_data; |
176 | if (!plat_data) { | 175 | if (!plat_data) { |
@@ -491,7 +490,6 @@ static int mpc85xx_l2_err_probe(struct platform_device *op) | |||
491 | 490 | ||
492 | pdata = edac_dev->pvt_info; | 491 | pdata = edac_dev->pvt_info; |
493 | pdata->name = "mpc85xx_l2_err"; | 492 | pdata->name = "mpc85xx_l2_err"; |
494 | pdata->irq = NO_IRQ; | ||
495 | edac_dev->dev = &op->dev; | 493 | edac_dev->dev = &op->dev; |
496 | dev_set_drvdata(edac_dev->dev, edac_dev); | 494 | dev_set_drvdata(edac_dev->dev, edac_dev); |
497 | edac_dev->ctl_name = pdata->name; | 495 | edac_dev->ctl_name = pdata->name; |
diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c index 6c54127e6eae..cb9b8577acbc 100644 --- a/drivers/edac/mv64x60_edac.c +++ b/drivers/edac/mv64x60_edac.c | |||
@@ -118,7 +118,6 @@ static int mv64x60_pci_err_probe(struct platform_device *pdev) | |||
118 | 118 | ||
119 | pdata->pci_hose = pdev->id; | 119 | pdata->pci_hose = pdev->id; |
120 | pdata->name = "mpc85xx_pci_err"; | 120 | pdata->name = "mpc85xx_pci_err"; |
121 | pdata->irq = NO_IRQ; | ||
122 | platform_set_drvdata(pdev, pci); | 121 | platform_set_drvdata(pdev, pci); |
123 | pci->dev = &pdev->dev; | 122 | pci->dev = &pdev->dev; |
124 | pci->dev_name = dev_name(&pdev->dev); | 123 | pci->dev_name = dev_name(&pdev->dev); |
@@ -291,7 +290,6 @@ static int mv64x60_sram_err_probe(struct platform_device *pdev) | |||
291 | 290 | ||
292 | pdata = edac_dev->pvt_info; | 291 | pdata = edac_dev->pvt_info; |
293 | pdata->name = "mv64x60_sram_err"; | 292 | pdata->name = "mv64x60_sram_err"; |
294 | pdata->irq = NO_IRQ; | ||
295 | edac_dev->dev = &pdev->dev; | 293 | edac_dev->dev = &pdev->dev; |
296 | platform_set_drvdata(pdev, edac_dev); | 294 | platform_set_drvdata(pdev, edac_dev); |
297 | edac_dev->dev_name = dev_name(&pdev->dev); | 295 | edac_dev->dev_name = dev_name(&pdev->dev); |
@@ -459,7 +457,6 @@ static int mv64x60_cpu_err_probe(struct platform_device *pdev) | |||
459 | 457 | ||
460 | pdata = edac_dev->pvt_info; | 458 | pdata = edac_dev->pvt_info; |
461 | pdata->name = "mv64x60_cpu_err"; | 459 | pdata->name = "mv64x60_cpu_err"; |
462 | pdata->irq = NO_IRQ; | ||
463 | edac_dev->dev = &pdev->dev; | 460 | edac_dev->dev = &pdev->dev; |
464 | platform_set_drvdata(pdev, edac_dev); | 461 | platform_set_drvdata(pdev, edac_dev); |
465 | edac_dev->dev_name = dev_name(&pdev->dev); | 462 | edac_dev->dev_name = dev_name(&pdev->dev); |
@@ -727,7 +724,6 @@ static int mv64x60_mc_err_probe(struct platform_device *pdev) | |||
727 | mci->pdev = &pdev->dev; | 724 | mci->pdev = &pdev->dev; |
728 | platform_set_drvdata(pdev, mci); | 725 | platform_set_drvdata(pdev, mci); |
729 | pdata->name = "mv64x60_mc_err"; | 726 | pdata->name = "mv64x60_mc_err"; |
730 | pdata->irq = NO_IRQ; | ||
731 | mci->dev_name = dev_name(&pdev->dev); | 727 | mci->dev_name = dev_name(&pdev->dev); |
732 | pdata->edac_idx = edac_mc_idx++; | 728 | pdata->edac_idx = edac_mc_idx++; |
733 | 729 | ||
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index d3a64ba61fa3..691ce25e9010 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c | |||
@@ -1029,8 +1029,6 @@ static int ppc4xx_edac_mc_init(struct mem_ctl_info *mci, | |||
1029 | pdata = mci->pvt_info; | 1029 | pdata = mci->pvt_info; |
1030 | 1030 | ||
1031 | pdata->dcr_host = *dcr_host; | 1031 | pdata->dcr_host = *dcr_host; |
1032 | pdata->irqs.sec = NO_IRQ; | ||
1033 | pdata->irqs.ded = NO_IRQ; | ||
1034 | 1032 | ||
1035 | /* Initialize controller capabilities and configuration */ | 1033 | /* Initialize controller capabilities and configuration */ |
1036 | 1034 | ||
@@ -1111,7 +1109,7 @@ static int ppc4xx_edac_register_irq(struct platform_device *op, | |||
1111 | ded_irq = irq_of_parse_and_map(np, INTMAP_ECCDED_INDEX); | 1109 | ded_irq = irq_of_parse_and_map(np, INTMAP_ECCDED_INDEX); |
1112 | sec_irq = irq_of_parse_and_map(np, INTMAP_ECCSEC_INDEX); | 1110 | sec_irq = irq_of_parse_and_map(np, INTMAP_ECCSEC_INDEX); |
1113 | 1111 | ||
1114 | if (ded_irq == NO_IRQ || sec_irq == NO_IRQ) { | 1112 | if (!ded_irq || !sec_irq) { |
1115 | ppc4xx_edac_mc_printk(KERN_ERR, mci, | 1113 | ppc4xx_edac_mc_printk(KERN_ERR, mci, |
1116 | "Unable to map interrupts.\n"); | 1114 | "Unable to map interrupts.\n"); |
1117 | status = -ENODEV; | 1115 | status = -ENODEV; |