From: Sasha Levin Date: Mon, 7 Oct 2024 20:39:47 +0000 (-0400) Subject: Drop driver-core-platform-emit-a-warning-if-a-remove-call.patch X-Git-Tag: v6.6.55~50 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8e7f70382c3e5c7c99072c2c96d3a50955bb074;p=thirdparty%2Fkernel%2Fstable-queue.git Drop driver-core-platform-emit-a-warning-if-a-remove-call.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/driver-core-platform-emit-a-warning-if-a-remove-call.patch b/queue-5.10/driver-core-platform-emit-a-warning-if-a-remove-call.patch deleted file mode 100644 index d5e8f4a4868..00000000000 --- a/queue-5.10/driver-core-platform-emit-a-warning-if-a-remove-call.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1aae6d5f36b6c14e608ba70cd678786e9fc5bb5e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 7 Feb 2021 22:15:37 +0100 -Subject: driver core: platform: Emit a warning if a remove callback returned - non-zero -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Uwe Kleine-König - -[ Upstream commit e5e1c209788138f33ca6558bf9f572f6904f486d ] - -The driver core ignores the return value of a bus' remove callback. However -a driver returning an error code is a hint that there is a problem, -probably a driver author who expects that returning e.g. -EBUSY has any -effect. - -The right thing to do would be to make struct platform_driver::remove() -return void. With the immense number of platform drivers this is however a -big quest and I hope to prevent at least a few new drivers that return an -error code here. - -Signed-off-by: Uwe Kleine-König -Link: https://lore.kernel.org/r/20210207211537.19992-1-uwe@kleine-koenig.org -Signed-off-by: Greg Kroah-Hartman -Stable-dep-of: cfd67903977b ("PCI: xilinx-nwl: Clean up clock on probe failure/removal") -Signed-off-by: Sasha Levin ---- - drivers/base/platform.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/drivers/base/platform.c b/drivers/base/platform.c -index 90166535a5c05..d0b15cbab0ff0 100644 ---- a/drivers/base/platform.c -+++ b/drivers/base/platform.c -@@ -1305,13 +1305,16 @@ static int platform_remove(struct device *_dev) - { - struct platform_driver *drv = to_platform_driver(_dev->driver); - struct platform_device *dev = to_platform_device(_dev); -- int ret = 0; - -- if (drv->remove) -- ret = drv->remove(dev); -+ if (drv->remove) { -+ int ret = drv->remove(dev); -+ -+ if (ret) -+ dev_warn(_dev, "remove callback returned a non-zero value. This will be ignored.\n"); -+ } - dev_pm_domain_detach(_dev, true); - -- return ret; -+ return 0; - } - - static void platform_shutdown(struct device *_dev) --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 0e151fc3865..a8e807f6782 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -166,7 +166,6 @@ pci-keystone-fix-if-statement-expression-in-ks_pcie_.patch pci-xilinx-nwl-fix-register-misspelling.patch driver-core-platform-reorder-functions.patch driver-core-platform-use-bus_type-functions.patch -driver-core-platform-emit-a-warning-if-a-remove-call.patch platform-provide-a-remove-callback-that-returns-no-v.patch pci-xilinx-nwl-clean-up-clock-on-probe-failure-remov.patch rdma-iwcm-fix-warning-at_kernel-workqueue.c-check_fl.patch