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: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20190730181557.90391-43-swboyd@chromium.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c
index 4f3c2c13a225f1c47f3b26981bbe8cd13fcdf53e..489cde4e915eff4a05c5e76505ac96f72c8e59e2 100644 (file)
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -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);
 

diff --git a/drivers/staging/goldfish/goldfish_audio.c b/drivers/staging/goldfish/goldfish_audio.c
index 24a738238f9fffb085b759ee7d683ac38a101fa2..0c65a0121dde15c91dfcada140ef70a9d60d2e17 100644 (file)
--- a/drivers/staging/goldfish/goldfish_audio.c
+++ b/drivers/staging/goldfish/goldfish_audio.c
@@ -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);

diff --git a/drivers/staging/media/allegro-dvt/allegro-core.c b/drivers/staging/media/allegro-dvt/allegro-core.c
index f050c7347fd5a27b6b40ce661104089ae8fdcb8e..6f0cd07847863862e25abe822884373601cfaa90 100644 (file)
--- a/drivers/staging/media/allegro-dvt/allegro-core.c
+++ b/drivers/staging/media/allegro-dvt/allegro-core.c
@@ -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,

diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
index c3665f0e87a275ee2100cb5a2b97867bb33f8a12..4a7afad2af92344e891f6f1c7a0f778df4b65c77 100644 (file)
--- a/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@ -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,

diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index 500b4c08d9677bb2a38672b699d548d28b47ee9a..d7d38dd9f1683a22760db36c94e976396e857c5a 100644 (file)
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -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))

diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c
index d1cdf011c8f1a1616bc9cead3a80dd202104e684..73d8354e618c47a99e1aa230510de70896df8f24 100644 (file)
--- a/drivers/staging/media/imx/imx7-mipi-csis.c
+++ b/drivers/staging/media/imx/imx7-mipi-csis.c
@@ -975,10 +975,8 @@ static int mipi_csis_probe(struct platform_device *pdev)
                return PTR_ERR(state->regs);
 
        state->irq = platform_get_irq(pdev, 0);
-       if (state->irq < 0) {
-               dev_err(dev, "Failed to get irq\n");
+       if (state->irq < 0)
                return state->irq;
-       }
 
        ret = mipi_csis_clk_get(state);
        if (ret < 0)

diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c
index 3a21a8cec7998f16efebef52d9719bf6a790384f..95102a4bdc62900fbf60229718530e9fa7d1ab1b 100644 (file)
--- a/drivers/staging/media/meson/vdec/esparser.c
+++ b/drivers/staging/media/meson/vdec/esparser.c
@@ -301,10 +301,8 @@ int esparser_init(struct platform_device *pdev, struct amvdec_core *core)
        int irq;
 
        irq = platform_get_irq_byname(pdev, "esparser");
-       if (irq < 0) {
-               dev_err(dev, "Failed getting ESPARSER IRQ from dtb\n");
+       if (irq < 0)
                return irq;
-       }
 
        ret = devm_request_irq(dev, irq, esparser_isr, IRQF_SHARED,
                               "esparserirq", core);

diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index c8be1db532ab255542d6d06d87dee2956f687175..1a966cb2f3a6bf754374781c6387466a3befe458 100644 (file)
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -1276,7 +1276,6 @@ static int iss_probe(struct platform_device *pdev)
        /* Interrupt */
        ret = platform_get_irq(pdev, 0);
        if (ret <= 0) {
-               dev_err(iss->dev, "No IRQ resource\n");
                ret = -ENODEV;
                goto error_iss;
        }

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
index c34aec7c6e4084115de388b219e8fe873cdd0a96..9ce3a65903c5d8be299fb5668839debcfc180c7e 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
@@ -160,11 +160,8 @@ int cedrus_hw_probe(struct cedrus_dev *dev)
        dev->capabilities = variant->capabilities;
 
        irq_dec = platform_get_irq(dev->pdev, 0);
-       if (irq_dec <= 0) {
-               dev_err(dev->dev, "Failed to get IRQ\n");
-
+       if (irq_dec <= 0)
                return irq_dec;
-       }
        ret = devm_request_irq(dev->dev, irq_dec, cedrus_irq,
                               0, dev_name(dev->dev), dev);
        if (ret) {

diff --git a/drivers/staging/most/dim2/dim2.c b/drivers/staging/most/dim2/dim2.c
index 043a3e14fdfc027c14a4cbd27d2c314dadccadf0..64c979155a49f382f410096c0a3a760e38f1ac8f 100644 (file)
--- a/drivers/staging/most/dim2/dim2.c
+++ b/drivers/staging/most/dim2/dim2.c
@@ -778,7 +778,6 @@ static int dim2_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, AHB0_INT_IDX);
        if (irq < 0) {
-               dev_err(&pdev->dev, "failed to get ahb0_int irq: %d\n", irq);
                ret = irq;
                goto err_shutdown_dim;
        }
@@ -792,7 +791,6 @@ static int dim2_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, MLB_INT_IDX);
        if (irq < 0) {
-               dev_err(&pdev->dev, "failed to get mlb_int irq: %d\n", irq);
                ret = irq;
                goto err_shutdown_dim;
        }

diff --git a/drivers/staging/mt7621-dma/mtk-hsdma.c b/drivers/staging/mt7621-dma/mtk-hsdma.c
index 60db06768c8ab9c4bcc78ffb53deb7a406d64557..d964642d95a3c9938ea2805a0ccc9775319564b0 100644 (file)
--- a/drivers/staging/mt7621-dma/mtk-hsdma.c
+++ b/drivers/staging/mt7621-dma/mtk-hsdma.c
@@ -675,10 +675,8 @@ static int mtk_hsdma_probe(struct platform_device *pdev)
        tasklet_init(&hsdma->task, mtk_hsdma_tasklet, (unsigned long)hsdma);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "failed to get irq\n");
+       if (irq < 0)
                return -EINVAL;
-       }
        ret = devm_request_irq(&pdev->dev, irq, mtk_hsdma_irq,
                               0, dev_name(&pdev->dev), hsdma);
        if (ret) {

diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 08027a36e0bcb9ef5c2efc9e0d03f50455aea7dc..1cbd7b71fc381213ded55d72f8bb9b2f0c35f88a 100644 (file)
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -796,10 +796,8 @@ static int tegra_nvec_probe(struct platform_device *pdev)
                return PTR_ERR(base);
 
        nvec->irq = platform_get_irq(pdev, 0);
-       if (nvec->irq < 0) {
-               dev_err(dev, "no irq resource?\n");
+       if (nvec->irq < 0)
                return -ENODEV;
-       }
 
        i2c_clk = devm_clk_get(dev, "div-clk");
        if (IS_ERR(i2c_clk)) {

diff --git a/drivers/staging/ralink-gdma/ralink-gdma.c b/drivers/staging/ralink-gdma/ralink-gdma.c
index 5854551d0a52c617b058adf70ce672e5dc2bec97..900424db9b978f606ad0b131f43a87b48afe96de 100644 (file)
--- a/drivers/staging/ralink-gdma/ralink-gdma.c
+++ b/drivers/staging/ralink-gdma/ralink-gdma.c
@@ -826,10 +826,8 @@ static int gdma_dma_probe(struct platform_device *pdev)
        tasklet_init(&dma_dev->task, gdma_dma_tasklet, (unsigned long)dma_dev);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "failed to get irq\n");
+       if (irq < 0)
                return -EINVAL;
-       }
        ret = devm_request_irq(&pdev->dev, irq, gdma_dma_irq,
                               0, dev_name(&pdev->dev), dma_dev);
        if (ret) {

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index 61c69f353cdb043107b8d64d60a2beb88d78fed9..8dc730cfe7a633ead8653ede308767b64c9144d2 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -141,10 +141,8 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)
                return PTR_ERR(g_regs);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq <= 0) {
-               dev_err(dev, "failed to get IRQ\n");
+       if (irq <= 0)
                return irq;
-       }
 
        err = devm_request_irq(dev, irq, vchiq_doorbell_irq, IRQF_IRQPOLL,
                               "VCHIQ doorbell", state);