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

Commit d1a55841 authored by Stephen Boyd's avatar Stephen Boyd Committed by David S. Miller
Browse files

net: 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 S. Miller" <davem@davemloft.net>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Saeed Mahameed <saeedm@mellanox.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Felix Fietkau <nbd@nbd.name>
Cc: Lorenzo Bianconi <lorenzo@kernel.org>
Cc: netdev@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d73a6c3

drivers/net/can/janz-ican3.c

+0 −1
Original line number Diff line number Diff line
@@ -1936,7 +1936,6 @@ static int ican3_probe(struct platform_device *pdev) 
	/* find our IRQ number */

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

	if (mod->irq < 0) {

		dev_err(dev, "IRQ line not found\n");

		ret = -ENODEV;

		goto out_free_ndev;

	}

drivers/net/can/rcar/rcar_can.c

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


	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

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

		err = irq;

		goto fail;

	}

drivers/net/can/rcar/rcar_canfd.c

+0 −2
Original line number Diff line number Diff line
@@ -1651,14 +1651,12 @@ static int rcar_canfd_probe(struct platform_device *pdev) 


	ch_irq = platform_get_irq(pdev, 0);

	if (ch_irq < 0) {

		dev_err(&pdev->dev, "no Channel IRQ resource\n");

		err = ch_irq;

		goto fail_dev;

	}



	g_irq = platform_get_irq(pdev, 1);

	if (g_irq < 0) {

		dev_err(&pdev->dev, "no Global IRQ resource\n");

		err = g_irq;

		goto fail_dev;

	}

drivers/net/can/sun4i_can.c

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


	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(&pdev->dev, "could not get a valid irq\n");

		err = -ENODEV;

		goto exit;

	}

drivers/net/ethernet/amd/au1000_eth.c

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


	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(&pdev->dev, "failed to retrieve IRQ\n");

		err = -ENODEV;

		goto out;

	}