Unverified Commit 6b8ac10e authored by Stephen Boyd's avatar Stephen Boyd Committed by Mark Brown
Browse files

spi: 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: Mark Brown <broonie@kernel.org>
Cc: linux-spi@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20190730181557.90391-42-swboyd@chromium.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4ff13d00

drivers/spi/atmel-quadspi.c

+0 −1
Original line number Diff line number Diff line
@@ -526,7 +526,6 @@ static int atmel_qspi_probe(struct platform_device *pdev) 
	/* Request the IRQ */

	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(&pdev->dev, "missing IRQ\n");

		err = irq;

		goto disable_qspick;

	}

drivers/spi/spi-armada-3700.c

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


	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "could not get irq: %d\n", irq);

		ret = -ENXIO;

		goto error;

	}

drivers/spi/spi-bcm2835.c

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


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

	if (bs->irq <= 0) {

		dev_err(&pdev->dev, "could not get IRQ: %d\n", bs->irq);

		err = bs->irq ? bs->irq : -ENODEV;

		goto out_controller_put;

	}

drivers/spi/spi-bcm2835aux.c

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


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

	if (bs->irq <= 0) {

		dev_err(&pdev->dev, "could not get IRQ: %d\n", bs->irq);

		err = bs->irq ? bs->irq : -ENODEV;

		goto out_master_put;

	}

drivers/spi/spi-bcm63xx-hsspi.c

+1 −3
Original line number Diff line number Diff line
@@ -338,10 +338,8 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) 
	u32 reg, rate, num_cs = HSSPI_SPI_MAX_CS;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "no irq: %d\n", irq);

	if (irq < 0)

		return irq;

	}



	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	regs = devm_ioremap_resource(dev, res_mem);

CRA Git | Maintained and supported by SUSTech CRA and CCSE