From 202bf62d70c9fa80620a674232f8a23cfacde36e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 29 Jan 2024 08:38:30 -0800 Subject: [PATCH] 4.19-stable patches added patches: revert-driver-core-annotate-dev_err_probe-with-__must_check.patch --- ...tate-dev_err_probe-with-__must_check.patch | 39 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-4.19/revert-driver-core-annotate-dev_err_probe-with-__must_check.patch diff --git a/queue-4.19/revert-driver-core-annotate-dev_err_probe-with-__must_check.patch b/queue-4.19/revert-driver-core-annotate-dev_err_probe-with-__must_check.patch new file mode 100644 index 00000000000..bfffd93d416 --- /dev/null +++ b/queue-4.19/revert-driver-core-annotate-dev_err_probe-with-__must_check.patch @@ -0,0 +1,39 @@ +From f601e8f37c2c1c52f2923fffc48204a7f7dc023d Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Wed, 9 Sep 2020 09:37:40 +0200 +Subject: Revert "driver core: Annotate dev_err_probe() with __must_check" + +From: Greg Kroah-Hartman + +commit f601e8f37c2c1c52f2923fffc48204a7f7dc023d upstream. + +This reverts commit e1f82a0dcf388d98bcc7ad195c03bd812405e6b2 as it's +already starting to cause build warnings in linux-next for things that +are "obviously correct". + +It's up to driver authors do "do the right thing" here with this +function, and if they don't want to call it as the last line of a +function, that's up to them, otherwise code that looks like: + ret = dev_err_probe(..., ret, ...); +does look really "odd". + +Reported-by: Stephen Rothwell +Reported-by: Krzysztof Kozlowski +Fixes: e1f82a0dcf38 ("driver core: Annotate dev_err_probe() with __must_check") +Cc: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/device.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/device.h ++++ b/include/linux/device.h +@@ -1582,7 +1582,7 @@ do { \ + dev_driver_string(dev), dev_name(dev), ## arg) + + extern __printf(3, 4) +-int __must_check dev_err_probe(const struct device *dev, int err, const char *fmt, ...); ++int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); + + /* Create alias, so I can be autoloaded. */ + #define MODULE_ALIAS_CHARDEV(major,minor) \ diff --git a/queue-4.19/series b/queue-4.19/series index bd4ee3d9484..cc76e050bd1 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -18,6 +18,7 @@ block-remove-special-casing-of-compound-pages.patch powerpc-use-always-instead-of-always-y-in-for-crtsavres.o.patch x86-cpu-amd-fix-disabling-xsaves-on-amd-family-0x17-due-to-erratum.patch driver-core-annotate-dev_err_probe-with-__must_check.patch +revert-driver-core-annotate-dev_err_probe-with-__must_check.patch driver-code-print-symbolic-error-code.patch drivers-core-fix-kernel-doc-markup-for-dev_err_probe.patch net-smc-fix-illegal-rmb_desc-access-in-smc-d-connect.patch -- 2.47.3