lkml.org 
[lkml]   [2019]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 33/57] pinctrl: Remove dev_err() usage after platform_get_irq()
    Date
    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>
    ---

    Please apply directly to subsystem trees

    drivers/pinctrl/pinctrl-amd.c | 4 +---
    drivers/pinctrl/pinctrl-oxnas.c | 4 +---
    drivers/pinctrl/pinctrl-pic32.c | 4 +---
    drivers/pinctrl/pinctrl-stmfx.c | 4 +---
    drivers/pinctrl/qcom/pinctrl-msm.c | 4 +---
    drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 5 +----
    6 files changed, 6 insertions(+), 19 deletions(-)

    diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
    index 9b9c61e3f065..60d88e1df272 100644
    --- 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 b4edbe0d9a73..4f6a196a663a 100644
    --- a/drivers/pinctrl/pinctrl-oxnas.c
    +++ b/drivers/pinctrl/pinctrl-oxnas.c
    @@ -1229,10 +1229,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 6dc98e22f9f5..e7f6dd5ab578 100644
    --- 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 d3332da35637..5735ef5a71d5 100644
    --- 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 7f35c196bb3e..45975ed31205 100644
    --- a/drivers/pinctrl/qcom/pinctrl-msm.c
    +++ b/drivers/pinctrl/qcom/pinctrl-msm.c
    @@ -1160,10 +1160,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 076ba085a6a1..3d8b1d74fa2f 100644
    --- 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)
    --
    Sent by a computer through tubes
    \
     
     \ /
      Last update: 2019-07-30 20:39    [W:4.111 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site