From: Sasha Levin Date: Fri, 16 Sep 2022 10:54:20 +0000 (-0400) Subject: Drop hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch X-Git-Tag: v4.9.329~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fe183ea8a55dd850952d65bcb8f407bdb0ddaa8;p=thirdparty%2Fkernel%2Fstable-queue.git Drop hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch b/queue-5.10/hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch deleted file mode 100644 index 4172bac61cc..00000000000 --- a/queue-5.10/hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d20abd39a7843f50e07b6487c205d775f3361ac1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 17 Aug 2022 15:04:00 +0200 -Subject: hwmon: (pmbus) Use dev_err_probe() to filter -EPROBE_DEFER error - messages - -From: Christophe JAILLET - -[ Upstream commit 09e52d17b72d3a4bf6951a90ccd8c97fae04e5cf ] - -devm_regulator_register() can return -EPROBE_DEFER, so better use -dev_err_probe() instead of dev_err(), it is less verbose in such a case. - -It is also more informative, which can't hurt. - -Signed-off-by: Christophe JAILLET -Link: https://lore.kernel.org/r/3adf1cea6e32e54c0f71f4604b4e98d992beaa71.1660741419.git.christophe.jaillet@wanadoo.fr -Signed-off-by: Guenter Roeck -Signed-off-by: Sasha Levin ---- - drivers/hwmon/pmbus/pmbus_core.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c -index 117e3ce9c76ad..6d8ace96b0a73 100644 ---- a/drivers/hwmon/pmbus/pmbus_core.c -+++ b/drivers/hwmon/pmbus/pmbus_core.c -@@ -2322,11 +2322,10 @@ static int pmbus_regulator_register(struct pmbus_data *data) - - rdev = devm_regulator_register(dev, &info->reg_desc[i], - &config); -- if (IS_ERR(rdev)) { -- dev_err(dev, "Failed to register %s regulator\n", -- info->reg_desc[i].name); -- return PTR_ERR(rdev); -- } -+ if (IS_ERR(rdev)) -+ return dev_err_probe(dev, PTR_ERR(rdev), -+ "Failed to register %s regulator\n", -+ info->reg_desc[i].name); - } - - return 0; --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index c1dc5c5788d..97e25eeae2b 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -4,7 +4,6 @@ iommu-vt-d-correctly-calculate-sagaw-value-of-iommu.patch tracefs-only-clobber-mode-uid-gid-on-remount-if-aske.patch input-goodix-add-support-for-gt1158.patch drm-msm-rd-fix-fifo-full-deadlock.patch -hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch hid-ishtp-hid-clienthid-ishtp-hid-client-fix-comment.patch hid-intel-ish-hid-ishtp-fix-ishtp-client-sending-dis.patch tg3-disable-tg3-device-on-system-reboot-to-avoid-tri.patch diff --git a/queue-5.15/hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch b/queue-5.15/hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch deleted file mode 100644 index d010192e2b1..00000000000 --- a/queue-5.15/hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 29df6813cb75d7b3832ecf1ec356d45e28ffb5ad Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 17 Aug 2022 15:04:00 +0200 -Subject: hwmon: (pmbus) Use dev_err_probe() to filter -EPROBE_DEFER error - messages - -From: Christophe JAILLET - -[ Upstream commit 09e52d17b72d3a4bf6951a90ccd8c97fae04e5cf ] - -devm_regulator_register() can return -EPROBE_DEFER, so better use -dev_err_probe() instead of dev_err(), it is less verbose in such a case. - -It is also more informative, which can't hurt. - -Signed-off-by: Christophe JAILLET -Link: https://lore.kernel.org/r/3adf1cea6e32e54c0f71f4604b4e98d992beaa71.1660741419.git.christophe.jaillet@wanadoo.fr -Signed-off-by: Guenter Roeck -Signed-off-by: Sasha Levin ---- - drivers/hwmon/pmbus/pmbus_core.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c -index 63b616ce3a6e9..6d5b228032cad 100644 ---- a/drivers/hwmon/pmbus/pmbus_core.c -+++ b/drivers/hwmon/pmbus/pmbus_core.c -@@ -2463,11 +2463,10 @@ static int pmbus_regulator_register(struct pmbus_data *data) - - rdev = devm_regulator_register(dev, &info->reg_desc[i], - &config); -- if (IS_ERR(rdev)) { -- dev_err(dev, "Failed to register %s regulator\n", -- info->reg_desc[i].name); -- return PTR_ERR(rdev); -- } -+ if (IS_ERR(rdev)) -+ return dev_err_probe(dev, PTR_ERR(rdev), -+ "Failed to register %s regulator\n", -+ info->reg_desc[i].name); - } - - return 0; --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 2b61bd544f2..3cfc181c51b 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -13,7 +13,6 @@ iommu-vt-d-fix-kdump-kernels-boot-failure-with-scala.patch input-goodix-add-support-for-gt1158.patch platform-surface-aggregator_registry-add-support-for.patch drm-msm-rd-fix-fifo-full-deadlock.patch -hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch dt-bindings-iio-gyroscope-bosch-bmg160-correct-numbe.patch hid-ishtp-hid-clienthid-ishtp-hid-client-fix-comment.patch hid-intel-ish-hid-ishtp-fix-ishtp-client-sending-dis.patch diff --git a/queue-5.19/hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch b/queue-5.19/hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch deleted file mode 100644 index df490e587e8..00000000000 --- a/queue-5.19/hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c5acee41f7f7e8542106b2ffe118fa17a188e790 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 17 Aug 2022 15:04:00 +0200 -Subject: hwmon: (pmbus) Use dev_err_probe() to filter -EPROBE_DEFER error - messages - -From: Christophe JAILLET - -[ Upstream commit 09e52d17b72d3a4bf6951a90ccd8c97fae04e5cf ] - -devm_regulator_register() can return -EPROBE_DEFER, so better use -dev_err_probe() instead of dev_err(), it is less verbose in such a case. - -It is also more informative, which can't hurt. - -Signed-off-by: Christophe JAILLET -Link: https://lore.kernel.org/r/3adf1cea6e32e54c0f71f4604b4e98d992beaa71.1660741419.git.christophe.jaillet@wanadoo.fr -Signed-off-by: Guenter Roeck -Signed-off-by: Sasha Levin ---- - drivers/hwmon/pmbus/pmbus_core.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c -index 02912022853d8..e81609bf47021 100644 ---- a/drivers/hwmon/pmbus/pmbus_core.c -+++ b/drivers/hwmon/pmbus/pmbus_core.c -@@ -2730,11 +2730,10 @@ static int pmbus_regulator_register(struct pmbus_data *data) - - rdev = devm_regulator_register(dev, &info->reg_desc[i], - &config); -- if (IS_ERR(rdev)) { -- dev_err(dev, "Failed to register %s regulator\n", -- info->reg_desc[i].name); -- return PTR_ERR(rdev); -- } -+ if (IS_ERR(rdev)) -+ return dev_err_probe(dev, PTR_ERR(rdev), -+ "Failed to register %s regulator\n", -+ info->reg_desc[i].name); - } - - return 0; --- -2.35.1 - diff --git a/queue-5.19/series b/queue-5.19/series index 50711e5cfae..bab79e8f982 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -9,7 +9,6 @@ input-goodix-add-support-for-gt1158.patch platform-surface-aggregator_registry-add-support-for.patch drm-msm-rd-fix-fifo-full-deadlock.patch peci-cpu-fix-use-after-free-in-adev_release.patch -hwmon-pmbus-use-dev_err_probe-to-filter-eprobe_defer.patch kvm-x86-mmu-always-flush-tlbs-when-enabling-dirty-lo.patch dt-bindings-iio-gyroscope-bosch-bmg160-correct-numbe.patch hid-ishtp-hid-clienthid-ishtp-hid-client-fix-comment.patch