From 9949db6070c6ca501d7235760ca8aba120db7448 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 31 Mar 2020 16:16:04 -0500 Subject: Linux v5.6-2405-gcad18da0afb1 --- regulator-pwm-Don-t-warn-on-probe-deferral.patch | 36 ------------------------ 1 file changed, 36 deletions(-) delete mode 100644 regulator-pwm-Don-t-warn-on-probe-deferral.patch (limited to 'regulator-pwm-Don-t-warn-on-probe-deferral.patch') diff --git a/regulator-pwm-Don-t-warn-on-probe-deferral.patch b/regulator-pwm-Don-t-warn-on-probe-deferral.patch deleted file mode 100644 index cebfae9de..000000000 --- a/regulator-pwm-Don-t-warn-on-probe-deferral.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0cd71b9a43ad80f4d9a8bfde6ec6db8daf447029 Mon Sep 17 00:00:00 2001 -From: Jon Hunter -Date: Mon, 2 Mar 2020 14:14:28 +0000 -Subject: regulator: pwm: Don't warn on probe deferral - -Deferred probe is an expected return value for devm_pwm_get(). Given -that the driver deals with it properly, rather than warn on probe -deferral, only output a message on probe deferral if debug level -prints are enabled. - -Signed-off-by: Jon Hunter -Link: https://lore.kernel.org/r/20200302141428.14119-1-jonathanh@nvidia.com -Signed-off-by: Mark Brown ---- - drivers/regulator/pwm-regulator.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c -index e74e11101fc1..638329bd0745 100644 ---- a/drivers/regulator/pwm-regulator.c -+++ b/drivers/regulator/pwm-regulator.c -@@ -354,7 +354,11 @@ static int pwm_regulator_probe(struct platform_device *pdev) - drvdata->pwm = devm_pwm_get(&pdev->dev, NULL); - if (IS_ERR(drvdata->pwm)) { - ret = PTR_ERR(drvdata->pwm); -- dev_err(&pdev->dev, "Failed to get PWM: %d\n", ret); -+ if (ret == -EPROBE_DEFER) -+ dev_dbg(&pdev->dev, -+ "Failed to get PWM, deferring probe\n"); -+ else -+ dev_err(&pdev->dev, "Failed to get PWM: %d\n", ret); - return ret; - } - --- -cgit 1.2-0.3.lf.el7 -- cgit