Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64c4dcbf authored by Stephen Boyd's avatar Stephen Boyd Committed by Linus Walleij
Browse files

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: default avatarStephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20190730181557.90391-34-swboyd@chromium.org


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 31b4c4b1

drivers/pinctrl/pinctrl-amd.c

+1 −3
Original line number Diff line number Diff line
@@ -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,

drivers/pinctrl/pinctrl-oxnas.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

drivers/pinctrl/pinctrl-pic32.c

+1 −3
Original line number Diff line number Diff line
@@ -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)) {

drivers/pinctrl/pinctrl-stmfx.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/pinctrl/qcom/pinctrl-msm.c

+1 −3
Original line number Diff line number Diff line
@@ -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;