summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-09 09:37:40 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-02-23 08:12:40 +0100
commitb715d543d42e8e4ddd645193410cd4511fc46d6c (patch)
tree7243929bfa2359e36a9fd9438170ab2e8b92dfc6 /include/linux
parentd31978bfec1d251a75d4a038e564ef2ff9d8be40 (diff)
downloadlinux-stable-b715d543d42e8e4ddd645193410cd4511fc46d6c.tar.gz
linux-stable-b715d543d42e8e4ddd645193410cd4511fc46d6c.tar.bz2
linux-stable-b715d543d42e8e4ddd645193410cd4511fc46d6c.zip
Revert "driver core: Annotate dev_err_probe() with __must_check"
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 <sfr@canb.auug.org.au> Reported-by: Krzysztof Kozlowski <krzk@kernel.org> Fixes: e1f82a0dcf38 ("driver core: Annotate dev_err_probe() with __must_check") Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/device.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 2e5926792f4e..0714d6e5d500 100644
--- 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) \