Drop regulator-max77620-silence-deferred-probe-error.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/regulator-max77620-silence-deferred-probe-error.patch b/queue-5.10/regulator-max77620-silence-deferred-probe-error.patch
deleted file mode 100644 (file)
index cae5a33..0000000
--- a/queue-5.10/regulator-max77620-silence-deferred-probe-error.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 31d92c774ea4d2deb3f132fc3e5140bc32f14ad6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 24 May 2021 01:42:43 +0300
-Subject: regulator: max77620: Silence deferred probe error
-
-From: Dmitry Osipenko <digetx@gmail.com>
-
-[ Upstream commit 62499a94ce5b9a41047dbadaad885347b1176079 ]
-
-One of previous changes to regulator core causes PMIC regulators to
-re-probe until supply regulator is registered. Silence noisy error
-message about the deferred probe.
-
-Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
-Link: https://lore.kernel.org/r/20210523224243.13219-3-digetx@gmail.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/regulator/max77620-regulator.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c
-index 5c439c850d09..3cf8f085170a 100644
---- a/drivers/regulator/max77620-regulator.c
-+++ b/drivers/regulator/max77620-regulator.c
-@@ -846,12 +846,10 @@ static int max77620_regulator_probe(struct platform_device *pdev)
-                       return ret;
- 
-               rdev = devm_regulator_register(dev, rdesc, &config);
--              if (IS_ERR(rdev)) {
--                      ret = PTR_ERR(rdev);
--                      dev_err(dev, "Regulator registration %s failed: %d\n",
--                              rdesc->name, ret);
--                      return ret;
--              }
-+              if (IS_ERR(rdev))
-+                      return dev_err_probe(dev, PTR_ERR(rdev),
-+                                           "Regulator registration %s failed\n",
-+                                           rdesc->name);
-       }
- 
-       return 0;
--- 
-2.30.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index b8ffa7f4ac4b31a620e8beb3c32afc904ebeafdf..010235d21d8c2fb4a8932bd458766d4fbc2aa0d6 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -72,7 +72,6 @@ bnxt_en-call-bnxt_ethtool_free-in-bnxt_init_one-erro.patch
 icmp-don-t-send-out-icmp-messages-with-a-source-addr.patch
 net-ethernet-fix-potential-use-after-free-in-ec_bhf_.patch
 regulator-cros-ec-fix-error-code-in-dev_err-message.patch
-regulator-max77620-silence-deferred-probe-error.patch
 regulator-bd70528-fix-off-by-one-for-buck123-.n_volt.patch
 platform-x86-thinkpad_acpi-add-x1-carbon-gen-9-secon.patch
 asoc-rt5659-fix-the-lost-powers-for-the-hda-header.patch

diff --git a/queue-5.12/regulator-max77620-silence-deferred-probe-error.patch b/queue-5.12/regulator-max77620-silence-deferred-probe-error.patch
deleted file mode 100644 (file)
index bd42f24..0000000
--- a/queue-5.12/regulator-max77620-silence-deferred-probe-error.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From c9ff4d8199ab833dc845155e78c1e35285c35c73 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 24 May 2021 01:42:43 +0300
-Subject: regulator: max77620: Silence deferred probe error
-
-From: Dmitry Osipenko <digetx@gmail.com>
-
-[ Upstream commit 62499a94ce5b9a41047dbadaad885347b1176079 ]
-
-One of previous changes to regulator core causes PMIC regulators to
-re-probe until supply regulator is registered. Silence noisy error
-message about the deferred probe.
-
-Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
-Link: https://lore.kernel.org/r/20210523224243.13219-3-digetx@gmail.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/regulator/max77620-regulator.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c
-index 5c439c850d09..3cf8f085170a 100644
---- a/drivers/regulator/max77620-regulator.c
-+++ b/drivers/regulator/max77620-regulator.c
-@@ -846,12 +846,10 @@ static int max77620_regulator_probe(struct platform_device *pdev)
-                       return ret;
- 
-               rdev = devm_regulator_register(dev, rdesc, &config);
--              if (IS_ERR(rdev)) {
--                      ret = PTR_ERR(rdev);
--                      dev_err(dev, "Regulator registration %s failed: %d\n",
--                              rdesc->name, ret);
--                      return ret;
--              }
-+              if (IS_ERR(rdev))
-+                      return dev_err_probe(dev, PTR_ERR(rdev),
-+                                           "Regulator registration %s failed\n",
-+                                           rdesc->name);
-       }
- 
-       return 0;
--- 
-2.30.2
-

diff --git a/queue-5.12/series b/queue-5.12/series
index c1198146d6e835c9af1ee16a0320dfd702c618be..234c4a86ef04229b65317acdd17a8995a3587812 100644 (file)
--- a/queue-5.12/series
+++ b/queue-5.12/series
@@ -86,7 +86,6 @@ bnxt_en-call-bnxt_ethtool_free-in-bnxt_init_one-erro.patch
 icmp-don-t-send-out-icmp-messages-with-a-source-addr.patch
 net-ethernet-fix-potential-use-after-free-in-ec_bhf_.patch
 regulator-cros-ec-fix-error-code-in-dev_err-message.patch
-regulator-max77620-silence-deferred-probe-error.patch
 regulator-bd70528-fix-off-by-one-for-buck123-.n_volt.patch
 platform-x86-thinkpad_acpi-add-x1-carbon-gen-9-secon.patch
 asoc-rt5659-fix-the-lost-powers-for-the-hda-header.patch