Message ID | 20190730181557.90391-16-swboyd@chromium.org |
---|---|
State | New |
Headers | show |
Series | None | expand |
wt., 30 lip 2019 o 20:16 Stephen Boyd <swboyd@chromium.org> napisaĆ(a): > > 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: Bartosz Golaszewski <bgolaszewski@baylibre.com> > 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/gpio/gpio-brcmstb.c | 4 +--- > drivers/gpio/gpio-eic-sprd.c | 4 +--- > drivers/gpio/gpio-grgpio.c | 2 -- > drivers/gpio/gpio-max77620.c | 4 +--- > drivers/gpio/gpio-pmic-eic-sprd.c | 4 +--- > drivers/gpio/gpio-sprd.c | 4 +--- > drivers/gpio/gpio-tb10x.c | 4 +--- > drivers/gpio/gpio-tegra.c | 4 +--- > drivers/gpio/gpio-zx.c | 1 - > drivers/gpio/gpio-zynq.c | 4 +--- > 10 files changed, 8 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c > index af936dcca659..05e3f99ae59c 100644 > --- a/drivers/gpio/gpio-brcmstb.c > +++ b/drivers/gpio/gpio-brcmstb.c > @@ -636,10 +636,8 @@ static int brcmstb_gpio_probe(struct platform_device *pdev) > > if (of_property_read_bool(np, "interrupt-controller")) { > priv->parent_irq = platform_get_irq(pdev, 0); > - if (priv->parent_irq <= 0) { > - dev_err(dev, "Couldn't get IRQ"); > + if (priv->parent_irq <= 0) > return -ENOENT; > - } > } else { > priv->parent_irq = -ENOENT; > } > diff --git a/drivers/gpio/gpio-eic-sprd.c b/drivers/gpio/gpio-eic-sprd.c > index 7b9ac4a12c20..fe7a73f52329 100644 > --- a/drivers/gpio/gpio-eic-sprd.c > +++ b/drivers/gpio/gpio-eic-sprd.c > @@ -584,10 +584,8 @@ static int sprd_eic_probe(struct platform_device *pdev) > sprd_eic->type = pdata->type; > > sprd_eic->irq = platform_get_irq(pdev, 0); > - if (sprd_eic->irq < 0) { > - dev_err(&pdev->dev, "Failed to get EIC interrupt.\n"); > + if (sprd_eic->irq < 0) > return sprd_eic->irq; > - } > > for (i = 0; i < SPRD_EIC_MAX_BANK; i++) { > /* > diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c > index 0937b605e134..08234e64993a 100644 > --- a/drivers/gpio/gpio-grgpio.c > +++ b/drivers/gpio/gpio-grgpio.c > @@ -408,8 +408,6 @@ static int grgpio_probe(struct platform_device *ofdev) > * Continue without irq functionality for that > * gpio line > */ > - dev_err(priv->dev, > - "Failed to get irq for offset %d\n", i); > continue; > } > priv->uirqs[lirq->index].uirq = ret; > diff --git a/drivers/gpio/gpio-max77620.c b/drivers/gpio/gpio-max77620.c > index b7d89e30131e..47d05e357e61 100644 > --- a/drivers/gpio/gpio-max77620.c > +++ b/drivers/gpio/gpio-max77620.c > @@ -270,10 +270,8 @@ static int max77620_gpio_probe(struct platform_device *pdev) > int ret; > > gpio_irq = platform_get_irq(pdev, 0); > - if (gpio_irq <= 0) { > - dev_err(&pdev->dev, "GPIO irq not available %d\n", gpio_irq); > + if (gpio_irq <= 0) > return -ENODEV; > - } > > mgpio = devm_kzalloc(&pdev->dev, sizeof(*mgpio), GFP_KERNEL); > if (!mgpio) > diff --git a/drivers/gpio/gpio-pmic-eic-sprd.c b/drivers/gpio/gpio-pmic-eic-sprd.c > index 24228cf79afc..05000cace9b2 100644 > --- a/drivers/gpio/gpio-pmic-eic-sprd.c > +++ b/drivers/gpio/gpio-pmic-eic-sprd.c > @@ -305,10 +305,8 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev) > mutex_init(&pmic_eic->buslock); > > pmic_eic->irq = platform_get_irq(pdev, 0); > - if (pmic_eic->irq < 0) { > - dev_err(&pdev->dev, "Failed to get PMIC EIC interrupt.\n"); > + if (pmic_eic->irq < 0) > return pmic_eic->irq; > - } > > pmic_eic->map = dev_get_regmap(pdev->dev.parent, NULL); > if (!pmic_eic->map) > diff --git a/drivers/gpio/gpio-sprd.c b/drivers/gpio/gpio-sprd.c > index f5c8b3a351d5..d7314d39ab65 100644 > --- a/drivers/gpio/gpio-sprd.c > +++ b/drivers/gpio/gpio-sprd.c > @@ -226,10 +226,8 @@ static int sprd_gpio_probe(struct platform_device *pdev) > return -ENOMEM; > > sprd_gpio->irq = platform_get_irq(pdev, 0); > - if (sprd_gpio->irq < 0) { > - dev_err(&pdev->dev, "Failed to get GPIO interrupt.\n"); > + if (sprd_gpio->irq < 0) > return sprd_gpio->irq; > - } > > sprd_gpio->base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(sprd_gpio->base)) > diff --git a/drivers/gpio/gpio-tb10x.c b/drivers/gpio/gpio-tb10x.c > index bd1f3f775ce9..5e375186f90e 100644 > --- a/drivers/gpio/gpio-tb10x.c > +++ b/drivers/gpio/gpio-tb10x.c > @@ -171,10 +171,8 @@ static int tb10x_gpio_probe(struct platform_device *pdev) > struct irq_chip_generic *gc; > > ret = platform_get_irq(pdev, 0); > - if (ret < 0) { > - dev_err(dev, "No interrupt specified.\n"); > + if (ret < 0) > return ret; > - } > > tb10x_gpio->gc.to_irq = tb10x_gpio_to_irq; > tb10x_gpio->irq = ret; > diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c > index 0f59161a4701..8a01d3694b28 100644 > --- a/drivers/gpio/gpio-tegra.c > +++ b/drivers/gpio/gpio-tegra.c > @@ -624,10 +624,8 @@ static int tegra_gpio_probe(struct platform_device *pdev) > > for (i = 0; i < tgi->bank_count; i++) { > ret = platform_get_irq(pdev, i); > - if (ret < 0) { > - dev_err(&pdev->dev, "Missing IRQ resource: %d\n", ret); > + if (ret < 0) > return ret; > - } > > bank = &tgi->bank_info[i]; > bank->bank = i; > diff --git a/drivers/gpio/gpio-zx.c b/drivers/gpio/gpio-zx.c > index 8637adb6bc20..8d9b9bf8510a 100644 > --- a/drivers/gpio/gpio-zx.c > +++ b/drivers/gpio/gpio-zx.c > @@ -253,7 +253,6 @@ static int zx_gpio_probe(struct platform_device *pdev) > writew_relaxed(0, chip->base + ZX_GPIO_IE); > irq = platform_get_irq(pdev, 0); > if (irq < 0) { > - dev_err(dev, "invalid IRQ\n"); > gpiochip_remove(&chip->gc); > return -ENODEV; > } > diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c > index f241b6c13dbe..86b0bd256c13 100644 > --- a/drivers/gpio/gpio-zynq.c > +++ b/drivers/gpio/gpio-zynq.c > @@ -849,10 +849,8 @@ static int zynq_gpio_probe(struct platform_device *pdev) > return PTR_ERR(gpio->base_addr); > > gpio->irq = platform_get_irq(pdev, 0); > - if (gpio->irq < 0) { > - dev_err(&pdev->dev, "invalid IRQ\n"); > + if (gpio->irq < 0) > return gpio->irq; > - } > > /* configure the gpio chip */ > chip = &gpio->chip; > -- > Sent by a computer through tubes > Acked-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
On Tue, Jul 30, 2019 at 8:16 PM Stephen Boyd <swboyd@chromium.org> wrote: > 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. (...) > While we're here, remove braces on if statements that only have one > statement (manually). > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com> > Cc: linux-gpio@vger.kernel.org > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Stephen Boyd <swboyd@chromium.org> Patch applied! Yours, Linus Walleij
diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index af936dcca659..05e3f99ae59c 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -636,10 +636,8 @@ static int brcmstb_gpio_probe(struct platform_device *pdev) if (of_property_read_bool(np, "interrupt-controller")) { priv->parent_irq = platform_get_irq(pdev, 0); - if (priv->parent_irq <= 0) { - dev_err(dev, "Couldn't get IRQ"); + if (priv->parent_irq <= 0) return -ENOENT; - } } else { priv->parent_irq = -ENOENT; } diff --git a/drivers/gpio/gpio-eic-sprd.c b/drivers/gpio/gpio-eic-sprd.c index 7b9ac4a12c20..fe7a73f52329 100644 --- a/drivers/gpio/gpio-eic-sprd.c +++ b/drivers/gpio/gpio-eic-sprd.c @@ -584,10 +584,8 @@ static int sprd_eic_probe(struct platform_device *pdev) sprd_eic->type = pdata->type; sprd_eic->irq = platform_get_irq(pdev, 0); - if (sprd_eic->irq < 0) { - dev_err(&pdev->dev, "Failed to get EIC interrupt.\n"); + if (sprd_eic->irq < 0) return sprd_eic->irq; - } for (i = 0; i < SPRD_EIC_MAX_BANK; i++) { /* diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c index 0937b605e134..08234e64993a 100644 --- a/drivers/gpio/gpio-grgpio.c +++ b/drivers/gpio/gpio-grgpio.c @@ -408,8 +408,6 @@ static int grgpio_probe(struct platform_device *ofdev) * Continue without irq functionality for that * gpio line */ - dev_err(priv->dev, - "Failed to get irq for offset %d\n", i); continue; } priv->uirqs[lirq->index].uirq = ret; diff --git a/drivers/gpio/gpio-max77620.c b/drivers/gpio/gpio-max77620.c index b7d89e30131e..47d05e357e61 100644 --- a/drivers/gpio/gpio-max77620.c +++ b/drivers/gpio/gpio-max77620.c @@ -270,10 +270,8 @@ static int max77620_gpio_probe(struct platform_device *pdev) int ret; gpio_irq = platform_get_irq(pdev, 0); - if (gpio_irq <= 0) { - dev_err(&pdev->dev, "GPIO irq not available %d\n", gpio_irq); + if (gpio_irq <= 0) return -ENODEV; - } mgpio = devm_kzalloc(&pdev->dev, sizeof(*mgpio), GFP_KERNEL); if (!mgpio) diff --git a/drivers/gpio/gpio-pmic-eic-sprd.c b/drivers/gpio/gpio-pmic-eic-sprd.c index 24228cf79afc..05000cace9b2 100644 --- a/drivers/gpio/gpio-pmic-eic-sprd.c +++ b/drivers/gpio/gpio-pmic-eic-sprd.c @@ -305,10 +305,8 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev) mutex_init(&pmic_eic->buslock); pmic_eic->irq = platform_get_irq(pdev, 0); - if (pmic_eic->irq < 0) { - dev_err(&pdev->dev, "Failed to get PMIC EIC interrupt.\n"); + if (pmic_eic->irq < 0) return pmic_eic->irq; - } pmic_eic->map = dev_get_regmap(pdev->dev.parent, NULL); if (!pmic_eic->map) diff --git a/drivers/gpio/gpio-sprd.c b/drivers/gpio/gpio-sprd.c index f5c8b3a351d5..d7314d39ab65 100644 --- a/drivers/gpio/gpio-sprd.c +++ b/drivers/gpio/gpio-sprd.c @@ -226,10 +226,8 @@ static int sprd_gpio_probe(struct platform_device *pdev) return -ENOMEM; sprd_gpio->irq = platform_get_irq(pdev, 0); - if (sprd_gpio->irq < 0) { - dev_err(&pdev->dev, "Failed to get GPIO interrupt.\n"); + if (sprd_gpio->irq < 0) return sprd_gpio->irq; - } sprd_gpio->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(sprd_gpio->base)) diff --git a/drivers/gpio/gpio-tb10x.c b/drivers/gpio/gpio-tb10x.c index bd1f3f775ce9..5e375186f90e 100644 --- a/drivers/gpio/gpio-tb10x.c +++ b/drivers/gpio/gpio-tb10x.c @@ -171,10 +171,8 @@ static int tb10x_gpio_probe(struct platform_device *pdev) struct irq_chip_generic *gc; ret = platform_get_irq(pdev, 0); - if (ret < 0) { - dev_err(dev, "No interrupt specified.\n"); + if (ret < 0) return ret; - } tb10x_gpio->gc.to_irq = tb10x_gpio_to_irq; tb10x_gpio->irq = ret; diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index 0f59161a4701..8a01d3694b28 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -624,10 +624,8 @@ static int tegra_gpio_probe(struct platform_device *pdev) for (i = 0; i < tgi->bank_count; i++) { ret = platform_get_irq(pdev, i); - if (ret < 0) { - dev_err(&pdev->dev, "Missing IRQ resource: %d\n", ret); + if (ret < 0) return ret; - } bank = &tgi->bank_info[i]; bank->bank = i; diff --git a/drivers/gpio/gpio-zx.c b/drivers/gpio/gpio-zx.c index 8637adb6bc20..8d9b9bf8510a 100644 --- a/drivers/gpio/gpio-zx.c +++ b/drivers/gpio/gpio-zx.c @@ -253,7 +253,6 @@ static int zx_gpio_probe(struct platform_device *pdev) writew_relaxed(0, chip->base + ZX_GPIO_IE); irq = platform_get_irq(pdev, 0); if (irq < 0) { - dev_err(dev, "invalid IRQ\n"); gpiochip_remove(&chip->gc); return -ENODEV; } diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c index f241b6c13dbe..86b0bd256c13 100644 --- a/drivers/gpio/gpio-zynq.c +++ b/drivers/gpio/gpio-zynq.c @@ -849,10 +849,8 @@ static int zynq_gpio_probe(struct platform_device *pdev) return PTR_ERR(gpio->base_addr); gpio->irq = platform_get_irq(pdev, 0); - if (gpio->irq < 0) { - dev_err(&pdev->dev, "invalid IRQ\n"); + if (gpio->irq < 0) return gpio->irq; - } /* configure the gpio chip */ chip = &gpio->chip;
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: Bartosz Golaszewski <bgolaszewski@baylibre.com> 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/gpio/gpio-brcmstb.c | 4 +--- drivers/gpio/gpio-eic-sprd.c | 4 +--- drivers/gpio/gpio-grgpio.c | 2 -- drivers/gpio/gpio-max77620.c | 4 +--- drivers/gpio/gpio-pmic-eic-sprd.c | 4 +--- drivers/gpio/gpio-sprd.c | 4 +--- drivers/gpio/gpio-tb10x.c | 4 +--- drivers/gpio/gpio-tegra.c | 4 +--- drivers/gpio/gpio-zx.c | 1 - drivers/gpio/gpio-zynq.c | 4 +--- 10 files changed, 8 insertions(+), 27 deletions(-)