[PATCH 06/24] Input: pwm-vibra - Simplify with dev_err_probe()

From: Krzysztof Kozlowski
Date: Wed Aug 26 2020 - 14:18:03 EST


Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and also it prints the error value.

Signed-off-by: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
---
drivers/input/misc/pwm-vibra.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/drivers/input/misc/pwm-vibra.c b/drivers/input/misc/pwm-vibra.c
index 81e777a04b88..e45cd6801208 100644
--- a/drivers/input/misc/pwm-vibra.c
+++ b/drivers/input/misc/pwm-vibra.c
@@ -135,21 +135,13 @@ static int pwm_vibrator_probe(struct platform_device *pdev)

vibrator->vcc = devm_regulator_get(&pdev->dev, "vcc");
err = PTR_ERR_OR_ZERO(vibrator->vcc);
- if (err) {
- if (err != -EPROBE_DEFER)
- dev_err(&pdev->dev, "Failed to request regulator: %d",
- err);
- return err;
- }
+ if (err)
+ return dev_err_probe(&pdev->dev, err, "Failed to request regulator\n");

vibrator->pwm = devm_pwm_get(&pdev->dev, "enable");
err = PTR_ERR_OR_ZERO(vibrator->pwm);
- if (err) {
- if (err != -EPROBE_DEFER)
- dev_err(&pdev->dev, "Failed to request main pwm: %d",
- err);
- return err;
- }
+ if (err)
+ return dev_err_probe(&pdev->dev, err, "Failed to request main pwm\n");

INIT_WORK(&vibrator->play_work, pwm_vibrator_play_work);

--
2.17.1