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 a872fc6..d7f6471 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -47,6 +47,8 @@ enum log_category_t {
        LOGC_DT,        /* Device-tree */
        LOGC_EFI,       /* EFI implementation */
        LOGC_ALLOC,     /* Memory allocation */
+       LOGC_SANDBOX,   /* Related to the sandbox board */
+       LOGC_BLOBLIST,  /* Bloblist */
 
        LOGC_COUNT,     /* Number of log categories */
        LOGC_END,       /* Sentinel value for a list of log categories */
@@ -71,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
@@ -107,14 +110,19 @@ int _log(enum log_category_t cat, enum log_level_t level, const char *file,
 #define log_io(_fmt...)
 #endif
 
+#if CONFIG_IS_ENABLED(LOG)
+
 /* 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); \
        })
+#else
+#define log(_cat, _level, _fmt, _args...)
+#endif
 
 #ifdef DEBUG
 #define _DEBUG 1
@@ -174,7 +182,16 @@ void __assert_fail(const char *assertion, const char *file, unsigned int line,
        ({ if (!(x) && _DEBUG) \
                __assert_fail(#x, __FILE__, __LINE__, __func__); })
 
-#ifdef CONFIG_LOG_ERROR_RETURN
+#if CONFIG_IS_ENABLED(LOG) && defined(CONFIG_LOG_ERROR_RETURN)
+/*
+ * Log an error return value, possibly with a message. Usage:
+ *
+ *     return log_ret(fred_call());
+ *
+ * or:
+ *
+ *     return log_msg_ret("fred failed", fred_call());
+ */
 #define log_ret(_ret) ({ \
        int __ret = (_ret); \
        if (__ret < 0) \
@@ -189,8 +206,9 @@ void __assert_fail(const char *assertion, const char *file, unsigned int line,
        __ret; \
        })
 #else
+/* Non-logging versions of the above which just return the error code */
 #define log_ret(_ret) (_ret)
-#define log_msg_ret(_msg, _ret) (_ret)
+#define log_msg_ret(_msg, _ret) ((void)(_msg), _ret)
 #endif
 
 /**