Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37209572 authored by Michael Ellerman's avatar Michael Ellerman Committed by Borislav Petkov
Browse files

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: default avatarMichael 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: default avatarBorislav Petkov <bp@suse.de>
parent 43fa9ba6

drivers/edac/mpc85xx_edac.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -170,7 +170,6 @@ static int mpc85xx_pci_err_probe(struct platform_device *op) 




	pdata = pci->pvt_info;

	pdata = pci->pvt_info;

	pdata->name = "mpc85xx_pci_err";

	pdata->name = "mpc85xx_pci_err";

	pdata->irq = NO_IRQ;





	plat_data = op->dev.platform_data;

	plat_data = op->dev.platform_data;

	if (!plat_data) {

	if (!plat_data) {
@@ -491,7 +490,6 @@ static int mpc85xx_l2_err_probe(struct platform_device *op) 




	pdata = edac_dev->pvt_info;

	pdata = edac_dev->pvt_info;

	pdata->name = "mpc85xx_l2_err";

	pdata->name = "mpc85xx_l2_err";

	pdata->irq = NO_IRQ;

	edac_dev->dev = &op->dev;

	edac_dev->dev = &op->dev;

	dev_set_drvdata(edac_dev->dev, edac_dev);

	dev_set_drvdata(edac_dev->dev, edac_dev);

	edac_dev->ctl_name = pdata->name;

	edac_dev->ctl_name = pdata->name;

drivers/edac/mv64x60_edac.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -118,7 +118,6 @@ static int mv64x60_pci_err_probe(struct platform_device *pdev) 




	pdata->pci_hose = pdev->id;

	pdata->pci_hose = pdev->id;

	pdata->name = "mpc85xx_pci_err";

	pdata->name = "mpc85xx_pci_err";

	pdata->irq = NO_IRQ;

	platform_set_drvdata(pdev, pci);

	platform_set_drvdata(pdev, pci);

	pci->dev = &pdev->dev;

	pci->dev = &pdev->dev;

	pci->dev_name = dev_name(&pdev->dev);

	pci->dev_name = dev_name(&pdev->dev);
@@ -291,7 +290,6 @@ static int mv64x60_sram_err_probe(struct platform_device *pdev) 




	pdata = edac_dev->pvt_info;

	pdata = edac_dev->pvt_info;

	pdata->name = "mv64x60_sram_err";

	pdata->name = "mv64x60_sram_err";

	pdata->irq = NO_IRQ;

	edac_dev->dev = &pdev->dev;

	edac_dev->dev = &pdev->dev;

	platform_set_drvdata(pdev, edac_dev);

	platform_set_drvdata(pdev, edac_dev);

	edac_dev->dev_name = dev_name(&pdev->dev);

	edac_dev->dev_name = dev_name(&pdev->dev);
@@ -459,7 +457,6 @@ static int mv64x60_cpu_err_probe(struct platform_device *pdev) 




	pdata = edac_dev->pvt_info;

	pdata = edac_dev->pvt_info;

	pdata->name = "mv64x60_cpu_err";

	pdata->name = "mv64x60_cpu_err";

	pdata->irq = NO_IRQ;

	edac_dev->dev = &pdev->dev;

	edac_dev->dev = &pdev->dev;

	platform_set_drvdata(pdev, edac_dev);

	platform_set_drvdata(pdev, edac_dev);

	edac_dev->dev_name = dev_name(&pdev->dev);

	edac_dev->dev_name = dev_name(&pdev->dev);
@@ -727,7 +724,6 @@ static int mv64x60_mc_err_probe(struct platform_device *pdev) 
	mci->pdev = &pdev->dev;

	mci->pdev = &pdev->dev;

	platform_set_drvdata(pdev, mci);

	platform_set_drvdata(pdev, mci);

	pdata->name = "mv64x60_mc_err";

	pdata->name = "mv64x60_mc_err";

	pdata->irq = NO_IRQ;

	mci->dev_name = dev_name(&pdev->dev);

	mci->dev_name = dev_name(&pdev->dev);

	pdata->edac_idx = edac_mc_idx++;

	pdata->edac_idx = edac_mc_idx++;

drivers/edac/ppc4xx_edac.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1029,8 +1029,6 @@ static int ppc4xx_edac_mc_init(struct mem_ctl_info *mci, 
	pdata			= mci->pvt_info;

	pdata			= mci->pvt_info;





	pdata->dcr_host		= *dcr_host;

	pdata->dcr_host		= *dcr_host;

	pdata->irqs.sec		= NO_IRQ;

	pdata->irqs.ded		= NO_IRQ;





	/* Initialize controller capabilities and configuration */

	/* Initialize controller capabilities and configuration */
@@ -1111,7 +1109,7 @@ static int ppc4xx_edac_register_irq(struct platform_device *op, 
	ded_irq = irq_of_parse_and_map(np, INTMAP_ECCDED_INDEX);

	ded_irq = irq_of_parse_and_map(np, INTMAP_ECCDED_INDEX);

	sec_irq = irq_of_parse_and_map(np, INTMAP_ECCSEC_INDEX);

	sec_irq = irq_of_parse_and_map(np, INTMAP_ECCSEC_INDEX);





	if (ded_irq == NO_IRQ || sec_irq == NO_IRQ) {

	if (!ded_irq || !sec_irq) {

		ppc4xx_edac_mc_printk(KERN_ERR, mci,

		ppc4xx_edac_mc_printk(KERN_ERR, mci,

				      "Unable to map interrupts.\n");

				      "Unable to map interrupts.\n");

		status = -ENODEV;

		status = -ENODEV;