diff options
| author | Ramon Fried <ramon.fried@gmail.com> | 2018-06-06 00:38:59 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-07 17:08:06 -0400 |
| commit | 948f32c8563568a76153f61ee4094c5aafe21eaf (patch) | |
| tree | 2f3102dd6f8799333ac7877da30165985ad07476 | |
| parent | 46960ad6d09b948b5df5236029bc072f9800aeb3 (diff) | |
bug.h: introduce WARN_ONCE
Add WARN_ONCE definition to allow single time notification
of warnings to the user.
Taken from Linux kernel (4.17) with slight changes
(Removed __section(.data.once))
Signed-off-by: Ramon Fried <ramon.fried@gmail.com>
[trini: Drop the musb and dwc3 compat versions]
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | drivers/usb/dwc3/linux-compat.h | 1 | ||||
| -rw-r--r-- | drivers/usb/musb-new/linux-compat.h | 6 | ||||
| -rw-r--r-- | include/linux/bug.h | 18 |
3 files changed, 18 insertions, 7 deletions
diff --git a/drivers/usb/dwc3/linux-compat.h b/drivers/usb/dwc3/linux-compat.h index 35850f91a3..82793765be 100644 --- a/drivers/usb/dwc3/linux-compat.h +++ b/drivers/usb/dwc3/linux-compat.h @@ -11,7 +11,6 @@ #ifndef __DWC3_LINUX_COMPAT__ #define __DWC3_LINUX_COMPAT__ -#define WARN(val, format, arg...) debug(format, ##arg) #define dev_WARN(dev, format, arg...) debug(format, ##arg) static inline size_t strlcat(char *dest, const char *src, size_t n) diff --git a/drivers/usb/musb-new/linux-compat.h b/drivers/usb/musb-new/linux-compat.h index 7bb53d2b19..f366ae58e8 100644 --- a/drivers/usb/musb-new/linux-compat.h +++ b/drivers/usb/musb-new/linux-compat.h @@ -5,12 +5,6 @@ #include <linux/list.h> #include <linux/compat.h> -#define WARN(condition, fmt, args...) ({ \ - int ret_warn = !!condition; \ - if (ret_warn) \ - printf(fmt, ##args); \ - ret_warn; }) - #define device_init_wakeup(dev, a) do {} while (0) #define platform_data device_data diff --git a/include/linux/bug.h b/include/linux/bug.h index f07bb716fc..29f84168a3 100644 --- a/include/linux/bug.h +++ b/include/linux/bug.h @@ -20,6 +20,13 @@ unlikely(__ret_warn_on); \ }) +#define WARN(condition, format...) ({ \ + int __ret_warn_on = !!(condition); \ + if (unlikely(__ret_warn_on)) \ + printf(format); \ + unlikely(__ret_warn_on); \ +}) + #define WARN_ON_ONCE(condition) ({ \ static bool __warned; \ int __ret_warn_once = !!(condition); \ @@ -31,4 +38,15 @@ unlikely(__ret_warn_once); \ }) +#define WARN_ONCE(condition, format...) ({ \ + static bool __warned; \ + int __ret_warn_once = !!(condition); \ + \ + if (unlikely(__ret_warn_once && !__warned)) { \ + __warned = true; \ + WARN(1, format); \ + } \ + unlikely(__ret_warn_once); \ +}) + #endif /* _LINUX_BUG_H */ |