From 8590b41fa37ed170e8a40091be79fbb6411ba58b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 9 Aug 2023 12:01:45 +0200 Subject: [PATCH] 5.4-stable patches added patches: driver-code-print-symbolic-error-code.patch driver-core-annotate-dev_err_probe-with-__must_check.patch drivers-core-fix-kernel-doc-markup-for-dev_err_probe.patch --- ...river-code-print-symbolic-error-code.patch | 37 ++++++++++++++++ ...tate-dev_err_probe-with-__must_check.patch | 34 +++++++++++++++ ...-kernel-doc-markup-for-dev_err_probe.patch | 43 +++++++++++++++++++ queue-5.4/series | 3 ++ 4 files changed, 117 insertions(+) create mode 100644 queue-5.4/driver-code-print-symbolic-error-code.patch create mode 100644 queue-5.4/driver-core-annotate-dev_err_probe-with-__must_check.patch create mode 100644 queue-5.4/drivers-core-fix-kernel-doc-markup-for-dev_err_probe.patch diff --git a/queue-5.4/driver-code-print-symbolic-error-code.patch b/queue-5.4/driver-code-print-symbolic-error-code.patch new file mode 100644 index 00000000000..d6a0e180cb8 --- /dev/null +++ b/queue-5.4/driver-code-print-symbolic-error-code.patch @@ -0,0 +1,37 @@ +From 693a8e936590f93451e6f5a3d748616f5a59c80b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= +Date: Fri, 28 Aug 2020 18:14:35 +0200 +Subject: driver code: print symbolic error code +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Michał Mirosław + +commit 693a8e936590f93451e6f5a3d748616f5a59c80b upstream. + +dev_err_probe() prepends the message with an error code. Let's make it +more readable by translating the code to a more recognisable symbol. + +Fixes: a787e5400a1c ("driver core: add device probe log helper") +Signed-off-by: Michał Mirosław +Link: https://lore.kernel.org/r/ea3f973e4708919573026fdce52c264db147626d.1598630856.git.mirq-linux@rere.qmqm.pl +Signed-off-by: Greg Kroah-Hartman +--- + drivers/base/core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/base/core.c ++++ b/drivers/base/core.c +@@ -3431,9 +3431,9 @@ int dev_err_probe(const struct device *d + vaf.va = &args; + + if (err != -EPROBE_DEFER) +- dev_err(dev, "error %d: %pV", err, &vaf); ++ dev_err(dev, "error %pe: %pV", ERR_PTR(err), &vaf); + else +- dev_dbg(dev, "error %d: %pV", err, &vaf); ++ dev_dbg(dev, "error %pe: %pV", ERR_PTR(err), &vaf); + + va_end(args); + diff --git a/queue-5.4/driver-core-annotate-dev_err_probe-with-__must_check.patch b/queue-5.4/driver-core-annotate-dev_err_probe-with-__must_check.patch new file mode 100644 index 00000000000..1f4197df22e --- /dev/null +++ b/queue-5.4/driver-core-annotate-dev_err_probe-with-__must_check.patch @@ -0,0 +1,34 @@ +From e1f82a0dcf388d98bcc7ad195c03bd812405e6b2 Mon Sep 17 00:00:00 2001 +From: Andy Shevchenko +Date: Wed, 26 Aug 2020 13:44:59 +0300 +Subject: driver core: Annotate dev_err_probe() with __must_check + +From: Andy Shevchenko + +commit e1f82a0dcf388d98bcc7ad195c03bd812405e6b2 upstream. + +We have got already new users of this API which interpret it differently +and miss the opportunity to optimize their code. + +In order to avoid similar cases in the future, annotate dev_err_probe() +with __must_check. + +Fixes: a787e5400a1c ("driver core: add device probe log helper") +Signed-off-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20200826104459.81979-1-andriy.shevchenko@linux.intel.com +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 +@@ -1872,7 +1872,7 @@ do { \ + dev_driver_string(dev), dev_name(dev), ## arg) + + extern __printf(3, 4) +-int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); ++int __must_check 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-5.4/drivers-core-fix-kernel-doc-markup-for-dev_err_probe.patch b/queue-5.4/drivers-core-fix-kernel-doc-markup-for-dev_err_probe.patch new file mode 100644 index 00000000000..ddf10504d2d --- /dev/null +++ b/queue-5.4/drivers-core-fix-kernel-doc-markup-for-dev_err_probe.patch @@ -0,0 +1,43 @@ +From 074b3aad307de6126fbac1fff4996d1034b48fee Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab +Date: Wed, 9 Sep 2020 11:53:43 +0200 +Subject: drivers: core: fix kernel-doc markup for dev_err_probe() + +From: Mauro Carvalho Chehab + +commit 074b3aad307de6126fbac1fff4996d1034b48fee upstream. + +There are two literal blocks there. Fix the markups, in order +to produce the right html output and solve those warnings: + + ./drivers/base/core.c:4218: WARNING: Unexpected indentation. + ./drivers/base/core.c:4222: WARNING: Definition list ends without a blank line; unexpected unindent. + ./drivers/base/core.c:4223: WARNING: Block quote ends without a blank line; unexpected unindent. + +Fixes: a787e5400a1c ("driver core: add device probe log helper") +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman +--- + drivers/base/core.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/base/core.c ++++ b/drivers/base/core.c +@@ -3409,13 +3409,15 @@ define_dev_printk_level(_dev_info, KERN_ + * This helper implements common pattern present in probe functions for error + * checking: print debug or error message depending if the error value is + * -EPROBE_DEFER and propagate error upwards. +- * It replaces code sequence: ++ * It replaces code sequence:: + * if (err != -EPROBE_DEFER) + * dev_err(dev, ...); + * else + * dev_dbg(dev, ...); + * return err; +- * with ++ * ++ * with:: ++ * + * return dev_err_probe(dev, err, ...); + * + * Returns @err. diff --git a/queue-5.4/series b/queue-5.4/series index a42c47ef8a3..5d6e72ad487 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -148,3 +148,6 @@ arm-dts-imx-align-l2-cache-controller-nodename-with-.patch arm-dts-imx-add-usb-alias.patch arm-dts-imx6sll-fixup-of-operating-points.patch arm-dts-nxp-imx6sll-fix-wrong-property-name-in-usbph.patch +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 -- 2.47.3