sunxi: usb: Switch to Generic host controllers

[platform/kernel/u-boot.git] / include / log.h

diff --git a/include/log.h b/include/log.h
index c88a1b5..d7f6471 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -73,7 +73,8 @@ static inline int log_uc_cat(enum uclass_id id)
  * @return 0 if log record was emitted, -ve on error
  */
 int _log(enum log_category_t cat, enum log_level_t level, const char *file,
-        int line, const char *func, const char *fmt, ...);
+        int line, const char *func, const char *fmt, ...)
+               __attribute__ ((format (__printf__, 6, 7)));
 
 /* Define this at the top of a file to add a prefix to debug messages */
 #ifndef pr_fmt
@@ -114,7 +115,7 @@ int _log(enum log_category_t cat, enum log_level_t level, const char *file,
 /* Emit a log record if the level is less that the maximum */
 #define log(_cat, _level, _fmt, _args...) ({ \
        int _l = _level; \
-       if (_l <= _LOG_MAX_LEVEL) \
+       if (CONFIG_IS_ENABLED(LOG) && _l <= _LOG_MAX_LEVEL) \
                _log((enum log_category_t)(_cat), _l, __FILE__, __LINE__, \
                      __func__, \
                      pr_fmt(_fmt), ##_args); \