iio: 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: Jonathan Cameron <jic23@kernel.org>
Cc: Hartmut Knaack <knaack.h@gmx.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Cc: linux-iio@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/ad7606_par.c b/drivers/iio/adc/ad7606_par.c
index 1b08028facde8c25552a99a65489ae0671784abb..f732b3ac78785444de9ed38b09ad4bd6a5b87b91 100644 (file)
--- a/drivers/iio/adc/ad7606_par.c
+++ b/drivers/iio/adc/ad7606_par.c
@@ -53,10 +53,8 @@ static int ad7606_par_probe(struct platform_device *pdev)
        int irq;
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "no irq: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        addr = devm_ioremap_resource(&pdev->dev, res);

diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 32f1c4a33b2085495bcc1f01909aa76a8fc4a329..abe99856c823ab6250bbfdedea447dcb337389d3 100644 (file)
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -1179,10 +1179,8 @@ static int at91_adc_probe(struct platform_device *pdev)
        idev->info = &at91_adc_info;
 
        st->irq = platform_get_irq(pdev, 0);
-       if (st->irq < 0) {
-               dev_err(&pdev->dev, "No IRQ ID is designated\n");
+       if (st->irq < 0)
                return -ENODEV;
-       }
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 

diff --git a/drivers/iio/adc/axp288_adc.c b/drivers/iio/adc/axp288_adc.c
index 31d51bcc5f2cd8fb13e432bfe321965a369d1faf..adc9cf7a075d200702cc34665e271a0e174d241a 100644 (file)
--- a/drivers/iio/adc/axp288_adc.c
+++ b/drivers/iio/adc/axp288_adc.c
@@ -225,10 +225,8 @@ static int axp288_adc_probe(struct platform_device *pdev)
 
        info = iio_priv(indio_dev);
        info->irq = platform_get_irq(pdev, 0);
-       if (info->irq < 0) {
-               dev_err(&pdev->dev, "no irq resource?\n");
+       if (info->irq < 0)
                return info->irq;
-       }
        platform_set_drvdata(pdev, indio_dev);
        info->regmap = axp20x->regmap;
        /*

diff --git a/drivers/iio/adc/bcm_iproc_adc.c b/drivers/iio/adc/bcm_iproc_adc.c
index c46c0aa15376c934578bd0ef40df015f2639a289..646ebdc0a8b4cbf552edefaaec017db75f61f416 100644 (file)
--- a/drivers/iio/adc/bcm_iproc_adc.c
+++ b/drivers/iio/adc/bcm_iproc_adc.c
@@ -540,11 +540,8 @@ static int iproc_adc_probe(struct platform_device *pdev)
        }
 
        adc_priv->irqno = platform_get_irq(pdev, 0);
-       if (adc_priv->irqno <= 0) {
-               dev_err(&pdev->dev, "platform_get_irq failed\n");
-               ret = -ENODEV;
-               return ret;
-       }
+       if (adc_priv->irqno <= 0)
+               return -ENODEV;
 
        ret = regmap_update_bits(adc_priv->regmap, IPROC_REGCTL2,
                                IPROC_ADC_AUXIN_SCAN_ENA, 0);

diff --git a/drivers/iio/adc/da9150-gpadc.c b/drivers/iio/adc/da9150-gpadc.c
index 3544339961010dfb2b6efc2ed492a905c2fb4a57..ae8bcc32f63d94be10396f75a075e6535cc9dd73 100644 (file)
--- a/drivers/iio/adc/da9150-gpadc.c
+++ b/drivers/iio/adc/da9150-gpadc.c
@@ -337,10 +337,8 @@ static int da9150_gpadc_probe(struct platform_device *pdev)
        init_completion(&gpadc->complete);
 
        irq = platform_get_irq_byname(pdev, "GPADC");
-       if (irq < 0) {
-               dev_err(dev, "Failed to get IRQ: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq,
                                        IRQF_ONESHOT, "GPADC", gpadc);

diff --git a/drivers/iio/adc/envelope-detector.c b/drivers/iio/adc/envelope-detector.c
index 2f2b563c116223ae824f9f58b6c86ef5eff628c9..28f3d6758eb5f51a03dc246d20077afe2ee3a1e4 100644 (file)
--- a/drivers/iio/adc/envelope-detector.c
+++ b/drivers/iio/adc/envelope-detector.c
@@ -357,11 +357,8 @@ static int envelope_detector_probe(struct platform_device *pdev)
        }
 
        env->comp_irq = platform_get_irq_byname(pdev, "comp");
-       if (env->comp_irq < 0) {
-               if (env->comp_irq != -EPROBE_DEFER)
-                       dev_err(dev, "failed to get compare interrupt\n");
+       if (env->comp_irq < 0)
                return env->comp_irq;
-       }
 
        ret = devm_request_irq(dev, env->comp_irq, envelope_detector_comp_isr,
                               0, "envelope-detector", env);

diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
index d4c3ece216792ac922f67c702110071c0c4f0595..42a3ced11fbdc5e8562331d557afab2bb73330c0 100644 (file)
--- a/drivers/iio/adc/exynos_adc.c
+++ b/drivers/iio/adc/exynos_adc.c
@@ -805,10 +805,8 @@ static int exynos_adc_probe(struct platform_device *pdev)
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "no irq resource?\n");
+       if (irq < 0)
                return irq;
-       }
        info->irq = irq;
 
        irq = platform_get_irq(pdev, 1);

diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c
index df19ecae52f74a89977132b7d83030b47f42760d..fa71489195c64b8a0480bb3f6d4cff202c69b67a 100644 (file)
--- a/drivers/iio/adc/fsl-imx25-gcq.c
+++ b/drivers/iio/adc/fsl-imx25-gcq.c
@@ -340,7 +340,6 @@ static int mx25_gcq_probe(struct platform_device *pdev)
 
        priv->irq = platform_get_irq(pdev, 0);
        if (priv->irq <= 0) {
-               dev_err(dev, "Failed to get IRQ\n");
                ret = priv->irq;
                if (!ret)
                        ret = -ENXIO;

diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c
index 26a7bbe4d534df3fb237bbf8597850dd4643966e..2a2fbf788e9567a78a67032744c9de2bcd7aa30c 100644 (file)
--- a/drivers/iio/adc/imx7d_adc.c
+++ b/drivers/iio/adc/imx7d_adc.c
@@ -492,10 +492,8 @@ static int imx7d_adc_probe(struct platform_device *pdev)
                return PTR_ERR(info->regs);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "No irq resource?\n");
+       if (irq < 0)
                return irq;
-       }
 
        info->clk = devm_clk_get(dev, "adc");
        if (IS_ERR(info->clk)) {

diff --git a/drivers/iio/adc/lpc32xx_adc.c b/drivers/iio/adc/lpc32xx_adc.c
index a6ee1c3a9064b3ca67faf38249b935c745adb2f6..b896f7ff4572eb539a94f44b11ac57be25d66d8a 100644 (file)
--- a/drivers/iio/adc/lpc32xx_adc.c
+++ b/drivers/iio/adc/lpc32xx_adc.c
@@ -172,10 +172,8 @@ static int lpc32xx_adc_probe(struct platform_device *pdev)
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq <= 0) {
-               dev_err(&pdev->dev, "failed getting interrupt resource\n");
+       if (irq <= 0)
                return -ENXIO;
-       }
 
        retval = devm_request_irq(&pdev->dev, irq, lpc32xx_adc_isr, 0,
                                  LPC32XXAD_NAME, st);

diff --git a/drivers/iio/adc/npcm_adc.c b/drivers/iio/adc/npcm_adc.c
index 193b3b81de4d31775fde5bc7b0ea801c330073dd..910f3585fa54b022a756660f693d70baf100b4af 100644 (file)
--- a/drivers/iio/adc/npcm_adc.c
+++ b/drivers/iio/adc/npcm_adc.c
@@ -225,7 +225,6 @@ static int npcm_adc_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq <= 0) {
-               dev_err(dev, "failed getting interrupt resource\n");
                ret = -EINVAL;
                goto err_disable_clk;
        }

diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
index dd8299831e09a4bcd4f869b70cf0fa5b60d667e6..582ba047c4a67404a71903cfff94af4e90f01b7b 100644 (file)
--- a/drivers/iio/adc/rockchip_saradc.c
+++ b/drivers/iio/adc/rockchip_saradc.c
@@ -244,10 +244,8 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
        init_completion(&info->completion);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "no irq resource?\n");
+       if (irq < 0)
                return irq;
-       }
 
        ret = devm_request_irq(&pdev->dev, irq, rockchip_saradc_isr,
                               0, dev_name(&pdev->dev), info);

diff --git a/drivers/iio/adc/sc27xx_adc.c b/drivers/iio/adc/sc27xx_adc.c
index d7ca002cbb1756face64b6721e51c996a618b0f8..c2203a46f0d826ec1077363566e76ef8280d465f 100644 (file)
--- a/drivers/iio/adc/sc27xx_adc.c
+++ b/drivers/iio/adc/sc27xx_adc.c
@@ -529,10 +529,8 @@ static int sc27xx_adc_probe(struct platform_device *pdev)
        }
 
        sc27xx_data->irq = platform_get_irq(pdev, 0);
-       if (sc27xx_data->irq < 0) {
-               dev_err(dev, "failed to get ADC irq number\n");
+       if (sc27xx_data->irq < 0)
                return sc27xx_data->irq;
-       }
 
        ret = of_hwspin_lock_get_id(np, 0);
        if (ret < 0) {

diff --git a/drivers/iio/adc/spear_adc.c b/drivers/iio/adc/spear_adc.c
index a33d0a4cc08835aee785bfb75a40defd5b2642ea..592b97c464daca2ea9a1a97a6119f0ec8ce7fed0 100644 (file)
--- a/drivers/iio/adc/spear_adc.c
+++ b/drivers/iio/adc/spear_adc.c
@@ -301,7 +301,6 @@ static int spear_adc_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq <= 0) {
-               dev_err(dev, "failed getting interrupt resource\n");
                ret = -EINVAL;
                goto errout2;
        }

diff --git a/drivers/iio/adc/stm32-adc-core.c b/drivers/iio/adc/stm32-adc-core.c
index 4299cef69385f3f374966fd49e96b86fa19b3781..9b85fefc0a963f382a0365f6aefec33770a187e1 100644 (file)
--- a/drivers/iio/adc/stm32-adc-core.c
+++ b/drivers/iio/adc/stm32-adc-core.c
@@ -374,7 +374,6 @@ static int stm32_adc_irq_probe(struct platform_device *pdev,
                         */
                        if (i && priv->irq[i] == -ENXIO)
                                continue;
-                       dev_err(&pdev->dev, "failed to get irq\n");
 
                        return priv->irq[i];
                }

diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
index 205e1699f954fced46bea0e886003a23a0cd0bca..6a7dd08b1e0b1fde1fbf361135228b969b7597fe 100644 (file)
--- a/drivers/iio/adc/stm32-adc.c
+++ b/drivers/iio/adc/stm32-adc.c
@@ -1919,10 +1919,8 @@ static int stm32_adc_probe(struct platform_device *pdev)
        }
 
        adc->irq = platform_get_irq(pdev, 0);
-       if (adc->irq < 0) {
-               dev_err(&pdev->dev, "failed to get irq\n");
+       if (adc->irq < 0)
                return adc->irq;
-       }
 
        ret = devm_request_irq(&pdev->dev, adc->irq, stm32_adc_isr,
                               0, pdev->name, adc);

diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c
index ee1e0569d0e166b5ba90156a3120a7d699d921e6..e493242c266ef77d4ab854672716a2ffc45a170a 100644 (file)
--- a/drivers/iio/adc/stm32-dfsdm-adc.c
+++ b/drivers/iio/adc/stm32-dfsdm-adc.c
@@ -1601,11 +1601,8 @@ static int stm32_dfsdm_adc_probe(struct platform_device *pdev)
         * So IRQ associated to filter instance 0 is dedicated to the Filter 0.
         */
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               if (irq != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to get IRQ: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        ret = devm_request_irq(dev, irq, stm32_dfsdm_irq,
                               0, pdev->name, adc);

diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c
index f13c6248a662f9bca7110bb6abc5cf84e9191ad4..176e1cb4abb1f3251f7d295a08e27c7260ee8f30 100644 (file)
--- a/drivers/iio/adc/sun4i-gpadc-iio.c
+++ b/drivers/iio/adc/sun4i-gpadc-iio.c
@@ -460,10 +460,8 @@ static int sun4i_irq_init(struct platform_device *pdev, const char *name,
        atomic_set(atomic, 1);
 
        ret = platform_get_irq_byname(pdev, name);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "no %s interrupt registered\n", name);
+       if (ret < 0)
                return ret;
-       }
 
        ret = regmap_irq_get_virq(mfd_dev->regmap_irqc, ret);
        if (ret < 0) {

diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
index 2fa6ec83bb13475fa3e076b96a4f844ce4763a09..f24148bd15de42cc9f3fafbf1e9876a9af0195a5 100644 (file)
--- a/drivers/iio/adc/twl6030-gpadc.c
+++ b/drivers/iio/adc/twl6030-gpadc.c
@@ -905,10 +905,8 @@ static int twl6030_gpadc_probe(struct platform_device *pdev)
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "failed to get irq\n");
+       if (irq < 0)
                return irq;
-       }
 
        ret = devm_request_threaded_irq(dev, irq, NULL,
                                twl6030_gpadc_irq_handler,

diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c
index 41d3621c4787e0e8579a22a19d44b681b2128ee9..98b30475bbc6acf67ad8ac9429cdd35798a6c17e 100644 (file)
--- a/drivers/iio/adc/vf610_adc.c
+++ b/drivers/iio/adc/vf610_adc.c
@@ -821,10 +821,8 @@ static int vf610_adc_probe(struct platform_device *pdev)
                return PTR_ERR(info->regs);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "no irq resource?\n");
+       if (irq < 0)
                return irq;
-       }
 
        ret = devm_request_irq(info->dev, irq,
                                vf610_adc_isr, 0,