Commit faac9102 authored by Stephen Boyd's avatar Stephen Boyd Committed by Alexandre Belloni
Browse files

rtc: 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: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: linux-rtc@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-40-swboyd@chromium.org


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent b0a3fa44

drivers/rtc/rtc-88pm80x.c

+0 −1
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ static int pm80x_rtc_probe(struct platform_device *pdev) 
		return -ENOMEM;

	info->irq = platform_get_irq(pdev, 0);

	if (info->irq < 0) {

		dev_err(&pdev->dev, "No IRQ resource!\n");

		ret = -EINVAL;

		goto out;

	}

drivers/rtc/rtc-88pm860x.c

+1 −3
Original line number Diff line number Diff line
@@ -328,10 +328,8 @@ static int pm860x_rtc_probe(struct platform_device *pdev) 
	if (!info)

		return -ENOMEM;

	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;

	}



	info->chip = chip;

	info->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion;

drivers/rtc/rtc-ac100.c

+1 −3
Original line number Diff line number Diff line
@@ -578,10 +578,8 @@ static int ac100_rtc_probe(struct platform_device *pdev) 
	chip->regmap = ac100->regmap;



	chip->irq = platform_get_irq(pdev, 0);

	if (chip->irq < 0) {

		dev_err(&pdev->dev, "No IRQ resource\n");

	if (chip->irq < 0)

		return chip->irq;

	}



	chip->rtc = devm_rtc_allocate_device(&pdev->dev);

	if (IS_ERR(chip->rtc))

drivers/rtc/rtc-armada38x.c

+1 −4
Original line number Diff line number Diff line
@@ -530,11 +530,8 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev) 
		return PTR_ERR(rtc->regs_soc);



	rtc->irq = platform_get_irq(pdev, 0);



	if (rtc->irq < 0) {

		dev_err(&pdev->dev, "no irq\n");

	if (rtc->irq < 0)

		return rtc->irq;

	}



	rtc->rtc_dev = devm_rtc_allocate_device(&pdev->dev);

	if (IS_ERR(rtc->rtc_dev))

drivers/rtc/rtc-asm9260.c

+1 −3
Original line number Diff line number Diff line
@@ -257,10 +257,8 @@ static int asm9260_rtc_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, priv);



	irq_alarm = platform_get_irq(pdev, 0);

	if (irq_alarm < 0) {

		dev_err(dev, "No alarm IRQ resource defined\n");

	if (irq_alarm < 0)

		return irq_alarm;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->iobase = devm_ioremap_resource(dev, res);

CRA Git | Maintained and supported by SUSTech CRA and CCSE