Commit 04d15d5c authored by Stephen Boyd's avatar Stephen Boyd Committed by Greg Kroah-Hartman
Browse files

staging: 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).

Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20190730181557.90391-43-swboyd@chromium.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 939878fe

drivers/staging/emxx_udc/emxx_udc.c

+1 −3
Original line number Diff line number Diff line
@@ -3094,10 +3094,8 @@ static int nbu2ss_drv_probe(struct platform_device *pdev) 
		return PTR_ERR(mmio_base);



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

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

	if (irq < 0)

		return irq;

	}

	status = devm_request_irq(&pdev->dev, irq, _nbu2ss_udc_irq,

				  0, driver_name, udc);

drivers/staging/goldfish/goldfish_audio.c

+1 −3
Original line number Diff line number Diff line
@@ -302,10 +302,8 @@ static int goldfish_audio_probe(struct platform_device *pdev) 
		return -ENOMEM;



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

	if (data->irq < 0) {

		dev_err(&pdev->dev, "platform_get_irq failed\n");

	if (data->irq < 0)

		return -ENODEV;

	}

	data->buffer_virt = dmam_alloc_coherent(&pdev->dev,

						COMBINED_BUFFER_SIZE,

						&buf_addr, GFP_KERNEL);

drivers/staging/media/allegro-dvt/allegro-core.c

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



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

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

	if (irq < 0)

		return irq;

	}

	ret = devm_request_threaded_irq(&pdev->dev, irq,

					allegro_hardirq,

					allegro_irq_thread,

drivers/staging/media/hantro/hantro_drv.c

+1 −3
Original line number Diff line number Diff line
@@ -733,10 +733,8 @@ static int hantro_probe(struct platform_device *pdev) 
			continue;



		irq = platform_get_irq_byname(vpu->pdev, irq_name);

		if (irq <= 0) {

			dev_err(vpu->dev, "Could not get %s IRQ.\n", irq_name);

		if (irq <= 0)

			return -ENXIO;

		}



		ret = devm_request_irq(vpu->dev, irq,

				       vpu->variant->irqs[i].handler, 0,

drivers/staging/media/imx/imx7-media-csi.c

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



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

	if (csi->irq < 0) {

		dev_err(dev, "Missing platform resources data\n");

	if (csi->irq < 0)

		return csi->irq;

	}



	csi->regbase = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(csi->regbase))

CRA Git | Maintained and supported by SUSTech CRA and CCSE