log: use BIT() instead of 1 <<

Use the BIT() macro when creating a bitmask for the logging fields.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/log_console.c b/common/log_console.c
index 0b5b7089af846df60485b8fef2ad2d05be3a5efa..bb3f8464b986d3eaaf972437b396b72d2b70d8c3 100644 (file)
--- a/common/log_console.c
+++ b/common/log_console.c
@@ -25,18 +25,18 @@ static int log_console_emit(struct log_device *ldev, struct log_rec *rec)
         *    - function is an identifier and ends with ()
         *    - message has a space before it unless it is on its own
         */
-       if (fmt & (1 << LOGF_LEVEL))
+       if (fmt & BIT(LOGF_LEVEL))
                printf("%s.", log_get_level_name(rec->level));
-       if (fmt & (1 << LOGF_CAT))
+       if (fmt & BIT(LOGF_CAT))
                printf("%s,", log_get_cat_name(rec->cat));
-       if (fmt & (1 << LOGF_FILE))
+       if (fmt & BIT(LOGF_FILE))
                printf("%s:", rec->file);
-       if (fmt & (1 << LOGF_LINE))
+       if (fmt & BIT(LOGF_LINE))
                printf("%d-", rec->line);
-       if (fmt & (1 << LOGF_FUNC))
+       if (fmt & BIT(LOGF_FUNC))
                printf("%s()", rec->func);
-       if (fmt & (1 << LOGF_MSG))
-               printf("%s%s", fmt != (1 << LOGF_MSG) ? " " : "", rec->msg);
+       if (fmt & BIT(LOGF_MSG))
+               printf("%s%s", fmt != BIT(LOGF_MSG) ? " " : "", rec->msg);
 
        return 0;
 }

diff --git a/common/log_syslog.c b/common/log_syslog.c
index 698c585fa11eeff51656b6e9722583dda10c323c..149ff5af310ade9b7deb1d236e5e11f18afc2f9b 100644 (file)
--- a/common/log_syslog.c
+++ b/common/log_syslog.c
@@ -82,21 +82,21 @@ static int log_syslog_emit(struct log_device *ldev, struct log_rec *rec)
        if (log_hostname)
                append(&ptr, msg_end, "%s ", log_hostname);
        append(&ptr, msg_end, "uboot: ");
-       if (fmt & (1 << LOGF_LEVEL))
+       if (fmt & BIT(LOGF_LEVEL))
                append(&ptr, msg_end, "%s.",
                       log_get_level_name(rec->level));
-       if (fmt & (1 << LOGF_CAT))
+       if (fmt & BIT(LOGF_CAT))
                append(&ptr, msg_end, "%s,",
                       log_get_cat_name(rec->cat));
-       if (fmt & (1 << LOGF_FILE))
+       if (fmt & BIT(LOGF_FILE))
                append(&ptr, msg_end, "%s:", rec->file);
-       if (fmt & (1 << LOGF_LINE))
+       if (fmt & BIT(LOGF_LINE))
                append(&ptr, msg_end, "%d-", rec->line);
-       if (fmt & (1 << LOGF_FUNC))
+       if (fmt & BIT(LOGF_FUNC))
                append(&ptr, msg_end, "%s()", rec->func);
-       if (fmt & (1 << LOGF_MSG))
+       if (fmt & BIT(LOGF_MSG))
                append(&ptr, msg_end, "%s%s",
-                      fmt != (1 << LOGF_MSG) ? " " : "", rec->msg);
+                      fmt != BIT(LOGF_MSG) ? " " : "", rec->msg);
        /* Consider trailing 0x00 */
        ptr++;