Re: [PATCH v2 1/3] Input: pwm-beeper: suppress error message on probe defer

From: Dmitry Torokhov
Date: Sat Jan 14 2017 - 14:17:25 EST


On Wed, Jan 11, 2017 at 02:01:59PM -0600, David Lechner wrote:
> This suppress printing an error message when pwm_get returns -EPROBE_DEFER.
> Otherwise you get a bunch of noise in the kernel log.
>
> Signed-off-by: David Lechner <david@xxxxxxxxxxxxxx>
> ---
> drivers/input/misc/pwm-beeper.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
> index ce6eec4..30ac227 100644
> --- a/drivers/input/misc/pwm-beeper.c
> +++ b/drivers/input/misc/pwm-beeper.c
> @@ -104,9 +104,10 @@ static int pwm_beeper_probe(struct platform_device *pdev)
> return -ENOMEM;
>
> beeper->pwm = devm_pwm_get(dev, NULL);
> - if (IS_ERR(beeper->pwm)) {
> - error = PTR_ERR(beeper->pwm);
> - dev_err(dev, "Failed to request pwm device: %d\n", error);
> + error = PTR_ERR_OR_ZERO(beeper->pwm);
> + if (error) {

I do not find it in any way clearer than

if (IS_ERR()) {
...

I prefer PTR_ERR_OR_ZERO be used when you need to return value without
acting on it.

I can adjust locally, no need to resubmit.

> + if (error != -EPROBE_DEFER)
> + dev_err(dev, "Failed to request pwm device\n");
> return error;
> }
>
> --
> 2.7.4
>

--
Dmitry