pinctrl: 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: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-gpio@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20190730181557.90391-34-swboyd@chromium.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index 9b9c61e3f0652e1995d677c6e4bde88678183271..60d88e1df2722e0f6600ab1d35e7db7879161768 100644 (file)
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -861,10 +861,8 @@ static int amd_gpio_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        irq_base = platform_get_irq(pdev, 0);
-       if (irq_base < 0) {
-               dev_err(&pdev->dev, "Failed to get gpio IRQ: %d\n", irq_base);
+       if (irq_base < 0)
                return irq_base;
-       }
 
 #ifdef CONFIG_PM_SLEEP
        gpio_dev->saved_regs = devm_kcalloc(&pdev->dev, amd_pinctrl_desc.npins,

diff --git a/drivers/pinctrl/pinctrl-oxnas.c b/drivers/pinctrl/pinctrl-oxnas.c
index fa81a09ccb8ea5d51bf123a974372ad9cd3a5dac..55488ca246f174e2bd77a9ac639d79dda6815b69 100644 (file)
--- a/drivers/pinctrl/pinctrl-oxnas.c
+++ b/drivers/pinctrl/pinctrl-oxnas.c
@@ -1225,10 +1225,8 @@ static int oxnas_gpio_probe(struct platform_device *pdev)
                return PTR_ERR(bank->reg_base);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "irq get failed\n");
+       if (irq < 0)
                return irq;
-       }
 
        bank->id = id;
        bank->gpio_chip.parent = &pdev->dev;

diff --git a/drivers/pinctrl/pinctrl-pic32.c b/drivers/pinctrl/pinctrl-pic32.c
index 6dc98e22f9f5dba25fe4f63ee9083914bfd9615f..e7f6dd5ab57848fdd8417f05444091f677d2758d 100644 (file)
--- a/drivers/pinctrl/pinctrl-pic32.c
+++ b/drivers/pinctrl/pinctrl-pic32.c
@@ -2222,10 +2222,8 @@ static int pic32_gpio_probe(struct platform_device *pdev)
                return PTR_ERR(bank->reg_base);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "irq get failed\n");
+       if (irq < 0)
                return irq;
-       }
 
        bank->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(bank->clk)) {

diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index 31b6e511670fc6da598de3fce80a36e729a3ce19..d7e37b51984fe54b647bfefff4e33fcec31e223e 100644 (file)
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -608,10 +608,8 @@ static int stmfx_pinctrl_probe(struct platform_device *pdev)
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq <= 0) {
-               dev_err(pctl->dev, "failed to get irq\n");
+       if (irq <= 0)
                return -ENXIO;
-       }
 
        mutex_init(&pctl->lock);
 

diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
index 0d082ed74eefaacb40aece32b31f5669f0284195..edecd653daa9df202c40f93eeab9798f01a0311c 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -1158,10 +1158,8 @@ int msm_pinctrl_probe(struct platform_device *pdev,
        msm_pinctrl_setup_pm_reset(pctrl);
 
        pctrl->irq = platform_get_irq(pdev, 0);
-       if (pctrl->irq < 0) {
-               dev_err(&pdev->dev, "No interrupt defined for msmgpio\n");
+       if (pctrl->irq < 0)
                return pctrl->irq;
-       }
 
        pctrl->desc.owner = THIS_MODULE;
        pctrl->desc.pctlops = &msm_pinctrl_ops;

diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
index 076ba085a6a12cb573d4177a38ce0829d44dc181..3d8b1d74fa2f0d46baee44508d665d212a8c0ab8 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
+++ b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
@@ -791,11 +791,8 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev)
        for (i = 0; i < pctrl->desc.npins; i++) {
                pin_data[i].reg = SSBI_REG_ADDR_MPP(i);
                pin_data[i].irq = platform_get_irq(pdev, i);
-               if (pin_data[i].irq < 0) {
-                       dev_err(&pdev->dev,
-                               "missing interrupts for pin %d\n", i);
+               if (pin_data[i].irq < 0)
                        return pin_data[i].irq;
-               }
 
                ret = pm8xxx_pin_populate(pctrl, &pin_data[i]);
                if (ret)