summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-09 09:37:40 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-09 09:37:40 +0200
commitf601e8f37c2c1c52f2923fffc48204a7f7dc023d (patch)
treea56bcd0125dd6fb6a1a67b278b29fae7d48ddac5
parent7c69898b86b45842e1c2799df845e203c71a667e (diff)
Revert "driver core: Annotate dev_err_probe() with __must_check"
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>
-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 85d5c28bed93..7a0938cf8bd7 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -924,7 +924,7 @@ void device_links_supplier_sync_state_pause(void);
void device_links_supplier_sync_state_resume(void);
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) \