diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-01 08:00:55 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-01 08:00:55 +0200 |
commit | 40e52b6c177f8fc783f2fcd263ce9f8e794f1e68 (patch) | |
tree | 1a14ca94701bffdf5767ed5a34e819b6f18e14a1 /regulator-pwm-Don-t-warn-on-probe-deferral.patch | |
parent | 422a191b6dd8e6006a1567fbb19754e9b33a0a8c (diff) | |
parent | 9949db6070c6ca501d7235760ca8aba120db7448 (diff) | |
download | kernel-40e52b6c177f8fc783f2fcd263ce9f8e794f1e68.tar.gz kernel-40e52b6c177f8fc783f2fcd263ce9f8e794f1e68.tar.xz kernel-40e52b6c177f8fc783f2fcd263ce9f8e794f1e68.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc0.git2.1.vanilla.knurd.1.fc33kernel-5.7.0-0.rc0.git2.1.vanilla.knurd.1.fc32kernel-5.7.0-0.rc0.git2.1.vanilla.knurd.1.fc31kernel-5.7.0-0.rc0.git2.1.vanilla.knurd.1.fc30
Diffstat (limited to 'regulator-pwm-Don-t-warn-on-probe-deferral.patch')
-rw-r--r-- | regulator-pwm-Don-t-warn-on-probe-deferral.patch | 36 |
1 files changed, 0 insertions, 36 deletions
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 <jonathanh@nvidia.com> -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 <jonathanh@nvidia.com> -Link: https://lore.kernel.org/r/20200302141428.14119-1-jonathanh@nvidia.com -Signed-off-by: Mark Brown <broonie@kernel.org> ---- - 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 |