iwmc3200top: cleanup log messages

[firefly-linux-kernel-4.4.55.git] / drivers / misc / iwmc3200top / fw-download.c

diff --git a/drivers/misc/iwmc3200top/fw-download.c b/drivers/misc/iwmc3200top/fw-download.c
index 474be92289045cf3874a8105ad68abc015446722..07055afef858b1ee3c21f1199a3de412939e39f4 100644 (file)
--- a/drivers/misc/iwmc3200top/fw-download.c
+++ b/drivers/misc/iwmc3200top/fw-download.c
@@ -43,7 +43,7 @@ static int iwmct_fw_parser_init(struct iwmct_priv *priv, const u8 *file,
        struct iwmct_parser *parser = &priv->parser;
        struct iwmct_fw_hdr *fw_hdr = &parser->versions;
 
-       LOG_INFOEX(priv, INIT, "-->\n");
+       LOG_TRACE(priv, FW_DOWNLOAD, "-->\n");
 
        LOG_INFO(priv, FW_DOWNLOAD, "file_size=%zd\n", file_size);
 
@@ -69,7 +69,7 @@ static int iwmct_fw_parser_init(struct iwmct_priv *priv, const u8 *file,
 
        parser->cur_pos += sizeof(struct iwmct_fw_hdr);
 
-       LOG_INFOEX(priv, INIT, "<--\n");
+       LOG_TRACE(priv, FW_DOWNLOAD, "<--\n");
        return 0;
 }
 
@@ -112,7 +112,7 @@ static int iwmct_parse_next_section(struct iwmct_priv *priv, const u8 **p_sec,
        struct iwmct_dbg *dbg = &priv->dbg;
        struct iwmct_fw_sec_hdr *sec_hdr;
 
-       LOG_INFOEX(priv, INIT, "-->\n");
+       LOG_TRACE(priv, FW_DOWNLOAD, "-->\n");
 
        while (parser->cur_pos + sizeof(struct iwmct_fw_sec_hdr)
                <= parser->file_size) {
@@ -151,7 +151,7 @@ static int iwmct_parse_next_section(struct iwmct_priv *priv, const u8 **p_sec,
                        "finished with section cur_pos=%zd\n", parser->cur_pos);
        }
 
-       LOG_INFOEX(priv, INIT, "<--\n");
+       LOG_TRACE(priv, INIT, "<--\n");
        return 0;
 }
 
@@ -166,7 +166,7 @@ static int iwmct_download_section(struct iwmct_priv *priv, const u8 *p_sec,
        int ret = 0;
        u32 cmd = 0;
 
-       LOG_INFOEX(priv, INIT, "-->\n");
+       LOG_TRACE(priv, FW_DOWNLOAD, "-->\n");
        LOG_INFO(priv, FW_DOWNLOAD, "Download address 0x%x size 0x%zx\n",
                                addr, sec_size);
 
@@ -250,7 +250,7 @@ static int iwmct_download_section(struct iwmct_priv *priv, const u8 *p_sec,
        if (sent < sec_size)
                ret = -EINVAL;
 exit:
-       LOG_INFOEX(priv, INIT, "<--\n");
+       LOG_TRACE(priv, FW_DOWNLOAD, "<--\n");
        return ret;
 }
 
@@ -261,7 +261,7 @@ static int iwmct_kick_fw(struct iwmct_priv *priv, bool jump)
        int ret;
        u32 cmd;
 
-       LOG_INFOEX(priv, INIT, "-->\n");
+       LOG_TRACE(priv, FW_DOWNLOAD, "-->\n");
 
        memset(parser->buf, 0, parser->buf_size);
        cmd = IWMC_CMD_SIGNATURE << CMD_HDR_SIGNATURE_POS;
@@ -284,7 +284,7 @@ static int iwmct_kick_fw(struct iwmct_priv *priv, bool jump)
        if (ret)
                LOG_INFO(priv, FW_DOWNLOAD, "iwmct_tx returned %d", ret);
 
-       LOG_INFOEX(priv, INIT, "<--\n");
+       LOG_TRACE(priv, FW_DOWNLOAD, "<--\n");
        return 0;
 }
 
@@ -298,6 +298,16 @@ int iwmct_fw_load(struct iwmct_priv *priv)
        int ret;
 
 
+       LOG_INFO(priv, FW_DOWNLOAD, "barker download request 0x%x is:\n",
+                       priv->barker);
+       LOG_INFO(priv, FW_DOWNLOAD, "*******  Top FW %s requested ********\n",
+                       (priv->barker & BARKER_DNLOAD_TOP_MSK) ? "was" : "not");
+       LOG_INFO(priv, FW_DOWNLOAD, "*******  GPS FW %s requested ********\n",
+                       (priv->barker & BARKER_DNLOAD_GPS_MSK) ? "was" : "not");
+       LOG_INFO(priv, FW_DOWNLOAD, "*******  BT FW %s requested ********\n",
+                       (priv->barker & BARKER_DNLOAD_BT_MSK) ? "was" : "not");
+
+
        /* get the firmware */
        ret = request_firmware(&raw, fw_name, &priv->func->dev);
        if (ret < 0) {