Skip to content

Commit

Permalink
regulator: Remove dev_err() usage after platform_get_irq()
Browse files Browse the repository at this point in the history
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: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@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-38-swboyd@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Stephen Boyd authored and Mark Brown committed Aug 2, 2019
1 parent 1889c6e commit 4724193
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 1 addition & 3 deletions drivers/regulator/da9062-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -1032,10 +1032,8 @@ static int da9062_regulator_probe(struct platform_device *pdev)

/* LDOs overcurrent event support */
irq = platform_get_irq_byname(pdev, "LDO_LIM");
if (irq < 0) {
dev_err(&pdev->dev, "Failed to get IRQ.\n");
if (irq < 0)
return irq;
}
regulators->irq_ldo_lim = irq;

ret = devm_request_threaded_irq(&pdev->dev, irq,
Expand Down
4 changes: 1 addition & 3 deletions drivers/regulator/da9063-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -863,10 +863,8 @@ static int da9063_regulator_probe(struct platform_device *pdev)

/* LDOs overcurrent event support */
irq = platform_get_irq_byname(pdev, "LDO_LIM");
if (irq < 0) {
dev_err(&pdev->dev, "Failed to get IRQ.\n");
if (irq < 0)
return irq;
}

ret = devm_request_threaded_irq(&pdev->dev, irq,
NULL, da9063_ldo_lim_event,
Expand Down

0 comments on commit 4724193

Please sign in to comment.