media: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c
index 3b1d60ca859b3834eea256f70b829c034ab5ccd9..2b42ba1f59494a1e4248e300329999dda629a671 100644 (file)
--- a/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/am437x/am437x-vpfe.c
@@ -2540,7 +2540,6 @@ static int vpfe_probe(struct platform_device *pdev)
 
        ret = platform_get_irq(pdev, 0);
        if (ret <= 0) {
-               dev_err(&pdev->dev, "No IRQ resource\n");
                ret = -ENODEV;
                goto probe_out_cleanup;
        }

diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
index 266df14da2d5ee4dcc6a8fd0111382ed16cc036a..78381651238dd7410b5292809b71f332a7de6554 100644 (file)
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
@@ -160,11 +160,8 @@ static int atmel_isc_probe(struct platform_device *pdev)
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               ret = irq;
-               dev_err(dev, "failed to get irq: %d\n", ret);
-               return ret;
-       }
+       if (irq < 0)
+               return irq;
 
        ret = devm_request_irq(dev, irq, isc_interrupt, 0,
                               ATMEL_ISC_NAME, isc);

diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
index 3e9ac6066cf6e25a043ed5c383bb2c859846cb5d..b9f1cc42b0ab9729a1d416d77a25e632f3dfbf45 100644 (file)
--- a/drivers/media/platform/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/exynos4-is/mipi-csis.c
@@ -803,10 +803,8 @@ static int s5pcsis_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;
-       }
 
        for (i = 0; i < CSIS_NUM_SUPPLIES; i++)
                state->supplies[i].supply = csis_supply_name[i];

diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/imx-pxp.c
index 8e7ef23b9a7edd74dd4b954d2b63d9d3748fa6c3..38d9423223025382d0e529dc82cc3229a8597765 100644 (file)
--- a/drivers/media/platform/imx-pxp.c
+++ b/drivers/media/platform/imx-pxp.c
@@ -1661,10 +1661,8 @@ static int pxp_probe(struct platform_device *pdev)
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "Failed to get irq resource: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, pxp_irq_handler,
                        IRQF_ONESHOT, dev_name(&pdev->dev), dev);

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 3b9c82b634332cbd0d1f822bdab6da4d58bbc721..36fb3bef7dbece28cc86ab5e72bd0096aadda677 100644 (file)
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2387,7 +2387,6 @@ static int isp_probe(struct platform_device *pdev)
        /* Interrupt */
        ret = platform_get_irq(pdev, 0);
        if (ret <= 0) {
-               dev_err(isp->dev, "No IRQ resource\n");
                ret = -ENODEV;
                goto error_iommu;
        }

diff --git a/drivers/media/platform/renesas-ceu.c b/drivers/media/platform/renesas-ceu.c
index 57d0c0f9fa4be56483becdc43cd96d0f1ce9d1df..197b3991330d588118d4ef2f6012732d043468d7 100644 (file)
--- a/drivers/media/platform/renesas-ceu.c
+++ b/drivers/media/platform/renesas-ceu.c
@@ -1659,10 +1659,8 @@ static int ceu_probe(struct platform_device *pdev)
        }
 
        ret = platform_get_irq(pdev, 0);
-       if (ret < 0) {
-               dev_err(dev, "Failed to get irq: %d\n", ret);
+       if (ret < 0)
                goto error_free_ceudev;
-       }
        irq = ret;
 
        ret = devm_request_irq(dev, irq, ceu_irq,

diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 5283d4533fa029333b72352156a272c64449f401..e9ff12b6b5bb5ebe68e712cb241caa1b0f556dad 100644 (file)
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -831,7 +831,6 @@ static int rga_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
-               dev_err(rga->dev, "failed to get irq\n");
                ret = irq;
                goto err_put_clk;
        }

diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/s3c-camif/camif-core.c
index f0acd6edcbbab5f8c95f97b712c5cca633ab8af8..c6fbcd7036d6d6ab7042f0858dd34aa2de973d6e 100644 (file)
--- a/drivers/media/platform/s3c-camif/camif-core.c
+++ b/drivers/media/platform/s3c-camif/camif-core.c
@@ -380,10 +380,8 @@ static int camif_request_irqs(struct platform_device *pdev,
                init_waitqueue_head(&vp->irq_queue);
 
                irq = platform_get_irq(pdev, i);
-               if (irq <= 0) {
-                       dev_err(&pdev->dev, "failed to get IRQ %d\n", i);
+               if (irq <= 0)
                        return -ENXIO;
-               }
 
                ret = devm_request_irq(&pdev->dev, irq, s3c_camif_irq_handler,
                                       0, dev_name(&pdev->dev), vp);

diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
index 3c05b3dc49ec0878912074754d8d772e1a933101..5baada4f65e5d022bab83de5bacaa48be44fbfdb 100644 (file)
--- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
+++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
@@ -693,16 +693,12 @@ static int c8sectpfe_probe(struct platform_device *pdev)
        fei->sram_size = resource_size(res);
 
        fei->idle_irq = platform_get_irq_byname(pdev, "c8sectpfe-idle-irq");
-       if (fei->idle_irq < 0) {
-               dev_err(dev, "Can't get c8sectpfe-idle-irq\n");
+       if (fei->idle_irq < 0)
                return fei->idle_irq;
-       }
 
        fei->error_irq = platform_get_irq_byname(pdev, "c8sectpfe-error-irq");
-       if (fei->error_irq < 0) {
-               dev_err(dev, "Can't get c8sectpfe-error-irq\n");
+       if (fei->error_irq < 0)
                return fei->error_irq;
-       }
 
        platform_set_drvdata(pdev, fei);
 

diff --git a/drivers/media/platform/sti/hva/hva-hw.c b/drivers/media/platform/sti/hva/hva-hw.c
index 7917fd2c4bd4b9bd2f5cb2da3ba0e787148c1521..401aaafa171096436c84e687f28400fc4bfa4619 100644 (file)
--- a/drivers/media/platform/sti/hva/hva-hw.c
+++ b/drivers/media/platform/sti/hva/hva-hw.c
@@ -341,10 +341,8 @@ int hva_hw_probe(struct platform_device *pdev, struct hva_dev *hva)
 
        /* get status interruption resource */
        ret  = platform_get_irq(pdev, 0);
-       if (ret < 0) {
-               dev_err(dev, "%s     failed to get status IRQ\n", HVA_PREFIX);
+       if (ret < 0)
                goto err_clk;
-       }
        hva->irq_its = ret;
 
        ret = devm_request_threaded_irq(dev, hva->irq_its, hva_hw_its_interrupt,
@@ -360,10 +358,8 @@ int hva_hw_probe(struct platform_device *pdev, struct hva_dev *hva)
 
        /* get error interruption resource */
        ret = platform_get_irq(pdev, 1);
-       if (ret < 0) {
-               dev_err(dev, "%s     failed to get error IRQ\n", HVA_PREFIX);
+       if (ret < 0)
                goto err_clk;
-       }
        hva->irq_err = ret;
 
        ret = devm_request_threaded_irq(dev, hva->irq_err, hva_hw_err_interrupt,

diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c
index d855e9c09c08a600a1fbe0a0cf7cb65918e467f2..672a53195b569ec375c95f9a854bf9c6793cd190 100644 (file)
--- a/drivers/media/platform/stm32/stm32-dcmi.c
+++ b/drivers/media/platform/stm32/stm32-dcmi.c
@@ -1699,11 +1699,8 @@ static int dcmi_probe(struct platform_device *pdev)
        dcmi->bus.data_shift = ep.bus.parallel.data_shift;
 
        irq = platform_get_irq(pdev, 0);
-       if (irq <= 0) {
-               if (irq != -EPROBE_DEFER)
-                       dev_err(&pdev->dev, "Could not get irq\n");
+       if (irq <= 0)
                return irq ? irq : -ENXIO;
-       }
 
        dcmi->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!dcmi->res) {

diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
index 6e0e894154f42c9f56c7c374515aa29b5a788a26..055eb0b8e396924268a43f17f849d3cb8b5e03b6 100644 (file)
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
@@ -866,11 +866,8 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev,
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "No csi IRQ specified\n");
-               ret = -ENXIO;
-               return ret;
-       }
+       if (irq < 0)
+               return -ENXIO;
 
        ret = devm_request_irq(&pdev->dev, irq, sun6i_csi_isr, 0, MODULE_NAME,
                               sdev);

diff --git a/drivers/media/rc/img-ir/img-ir-core.c b/drivers/media/rc/img-ir/img-ir-core.c
index 7e457f26a5959afab9a93281de122c4e88378747..094aa6a063156835ff5c8efbf863fc0e7026cbb0 100644 (file)
--- a/drivers/media/rc/img-ir/img-ir-core.c
+++ b/drivers/media/rc/img-ir/img-ir-core.c
@@ -81,10 +81,8 @@ static int img_ir_probe(struct platform_device *pdev)
 
        /* Get resources from platform device */
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "cannot find IRQ resource\n");
+       if (irq < 0)
                return irq;
-       }
 
        /* Private driver data */
        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c
index 85561f6555a2261840fa558467afc9d5d9bfebdd..32ccefeff57d15c4de1e88791d3d2eed6a3cfb78 100644 (file)
--- a/drivers/media/rc/ir-hix5hd2.c
+++ b/drivers/media/rc/ir-hix5hd2.c
@@ -232,10 +232,8 @@ static int hix5hd2_ir_probe(struct platform_device *pdev)
                return PTR_ERR(priv->base);
 
        priv->irq = platform_get_irq(pdev, 0);
-       if (priv->irq < 0) {
-               dev_err(dev, "irq can not get\n");
+       if (priv->irq < 0)
                return priv->irq;
-       }
 
        rdev = rc_allocate_device(RC_DRIVER_IR_RAW);
        if (!rdev)

diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c
index 72a7bbbf6b1f03eb1393be9e8dd5dc53edb93856..51c6dd3406a0efb8b2012dbcc8d6c2714fcfca21 100644 (file)
--- a/drivers/media/rc/meson-ir.c
+++ b/drivers/media/rc/meson-ir.c
@@ -117,10 +117,8 @@ static int meson_ir_probe(struct platform_device *pdev)
                return PTR_ERR(ir->reg);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "no irq resource\n");
+       if (irq < 0)
                return irq;
-       }
 
        ir->rc = devm_rc_allocate_device(dev, RC_DRIVER_IR_RAW);
        if (!ir->rc) {

diff --git a/drivers/media/rc/mtk-cir.c b/drivers/media/rc/mtk-cir.c
index 99a3f1e773c6e544452c28396d59604befa77229..a0c94ab322c7d26190e5cdbb95f7ccd93b2e4638 100644 (file)
--- a/drivers/media/rc/mtk-cir.c
+++ b/drivers/media/rc/mtk-cir.c
@@ -358,10 +358,8 @@ static int mtk_ir_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, ir);
 
        ir->irq = platform_get_irq(pdev, 0);
-       if (ir->irq < 0) {
-               dev_err(dev, "no irq resource\n");
+       if (ir->irq < 0)
                return -ENODEV;
-       }
 
        if (clk_prepare_enable(ir->clk)) {
                dev_err(dev, "try to enable ir_clk failed\n");

diff --git a/drivers/media/rc/sunxi-cir.c b/drivers/media/rc/sunxi-cir.c
index f91154c2f45c84fc757a457b535e01e35c01b4b2..e222b4c98be42cff13b7b530278b626518182d37 100644 (file)
--- a/drivers/media/rc/sunxi-cir.c
+++ b/drivers/media/rc/sunxi-cir.c
@@ -256,7 +256,6 @@ static int sunxi_ir_probe(struct platform_device *pdev)
        /* IRQ */
        ir->irq = platform_get_irq(pdev, 0);
        if (ir->irq < 0) {
-               dev_err(dev, "no irq resource\n");
                ret = ir->irq;
                goto exit_free_dev;
        }