Commit aab478ca authored by Stephen Boyd's avatar Stephen Boyd Committed by Miquel Raynal
Browse files

mtd: Remove dev_err() usage after platform_get_irq() 



We don't need dev_err() messages when platform_get_irq() fails now that
platform_get_irq() prints an error message itself when something goes
wrong. Let's remove these prints with a simple semantic patch.

// <smpl>
@@
expression ret;
struct platform_device *E;
@@

ret =
(
platform_get_irq(E, ...)
|
platform_get_irq_byname(E, ...)
);

if ( \( ret < 0 \| ret <= 0 \) )
{
(
-if (ret != -EPROBE_DEFER)
-{ ...
-dev_err(...);
-... }
|
...
-dev_err(...);
)
...
}
// </smpl>

While we're here, remove braces on if statements that only have one
statement (manually).

Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: linux-mtd@lists.infradead.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 0990fc56

drivers/mtd/devices/spear_smi.c

+0 −1
Original line number Diff line number Diff line
@@ -933,7 +933,6 @@ static int spear_smi_probe(struct platform_device *pdev) 
	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		ret = -ENODEV;

		dev_err(&pdev->dev, "invalid smi irq\n");

		goto err;

	}

drivers/mtd/nand/raw/denali_dt.c

+1 −3
Original line number Diff line number Diff line
@@ -167,10 +167,8 @@ static int denali_dt_probe(struct platform_device *pdev) 


	denali->dev = dev;

	denali->irq = platform_get_irq(pdev, 0);

	if (denali->irq < 0) {

		dev_err(dev, "no irq defined\n");

	if (denali->irq < 0)

		return denali->irq;

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "denali_reg");

	denali->reg = devm_ioremap_resource(dev, res);

drivers/mtd/nand/raw/hisi504_nand.c

+1 −3
Original line number Diff line number Diff line
@@ -751,10 +751,8 @@ static int hisi_nfc_probe(struct platform_device *pdev) 
	mtd  = nand_to_mtd(chip);



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "no IRQ resource defined\n");

	if (irq < 0)

		return -ENXIO;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	host->iobase = devm_ioremap_resource(dev, res);

drivers/mtd/nand/raw/lpc32xx_mlc.c

+0 −1
Original line number Diff line number Diff line
@@ -773,7 +773,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) 


	host->irq = platform_get_irq(pdev, 0);

	if (host->irq < 0) {

		dev_err(&pdev->dev, "failed to get platform irq\n");

		res = -EINVAL;

		goto release_dma_chan;

	}

drivers/mtd/nand/raw/marvell_nand.c

+1 −3
Original line number Diff line number Diff line
@@ -2862,10 +2862,8 @@ static int marvell_nfc_probe(struct platform_device *pdev) 
		return PTR_ERR(nfc->regs);



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "failed to retrieve irq\n");

	if (irq < 0)

		return irq;

	}



	nfc->core_clk = devm_clk_get(&pdev->dev, "core");

CRA Git | Maintained and supported by SUSTech CRA and CCSE