iwmc3200top: cleanup log messages

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

diff --git a/drivers/misc/iwmc3200top/main.c b/drivers/misc/iwmc3200top/main.c
index fafcaa481d74a29b14a9080f002ec81d8200b51b..38627949ff54b859d9152780455894ffa33ba110 100644 (file)
--- a/drivers/misc/iwmc3200top/main.c
+++ b/drivers/misc/iwmc3200top/main.c
@@ -66,7 +66,7 @@ static void iwmct_rescan_worker(struct work_struct *ws)
 
        ret = bus_rescan_devices(priv->func->dev.bus);
        if (ret < 0)
-               LOG_INFO(priv, FW_DOWNLOAD, "bus_rescan_devices FAILED!!!\n");
+               LOG_INFO(priv, INIT, "bus_rescan_devices FAILED!!!\n");
 }
 
 static void op_top_message(struct iwmct_priv *priv, struct top_msg *msg)
@@ -137,7 +137,7 @@ int iwmct_send_hcmd(struct iwmct_priv *priv, u8 *cmd, u16 len)
        int ret;
        u8 *buf;
 
-       LOG_INFOEX(priv, FW_MSG, "Sending hcmd:\n");
+       LOG_TRACE(priv, FW_MSG, "Sending hcmd:\n");
 
        /* add padding to 256 for IWMC */
        ((struct top_msg *)cmd)->hdr.flags |= CMD_FLAG_PADDING_256;
@@ -192,7 +192,7 @@ static void iwmct_irq_read_worker(struct work_struct *ws)
 
        priv = container_of(ws, struct iwmct_priv, isr_worker);
 
-       LOG_INFO(priv, IRQ, "enter iwmct_irq_read_worker %p\n", ws);
+       LOG_TRACE(priv, IRQ, "enter iwmct_irq_read_worker %p\n", ws);
 
        /* --------------------- Handshake with device -------------------- */
        sdio_claim_host(priv->func);
@@ -292,15 +292,6 @@ static void iwmct_irq_read_worker(struct work_struct *ws)
 
        sdio_release_host(priv->func);
 
-
-       LOG_INFO(priv, IRQ, "barker download request 0x%x is:\n", priv->barker);
-       LOG_INFO(priv, IRQ, "*******  Top FW %s requested ********\n",
-                       (priv->barker & BARKER_DNLOAD_TOP_MSK) ? "was" : "not");
-       LOG_INFO(priv, IRQ, "*******  GPS FW %s requested ********\n",
-                       (priv->barker & BARKER_DNLOAD_GPS_MSK) ? "was" : "not");
-       LOG_INFO(priv, IRQ, "*******  BT FW %s requested ********\n",
-                       (priv->barker & BARKER_DNLOAD_BT_MSK) ? "was" : "not");
-
        if (priv->dbg.fw_download)
                iwmct_fw_load(priv);
        else
@@ -312,7 +303,7 @@ exit_release:
        sdio_release_host(priv->func);
 exit:
        kfree(buf);
-       LOG_INFO(priv, IRQ, "exit iwmct_irq_read_worker\n");
+       LOG_TRACE(priv, IRQ, "exit iwmct_irq_read_worker\n");
 }
 
 static void iwmct_irq(struct sdio_func *func)
@@ -325,12 +316,12 @@ static void iwmct_irq(struct sdio_func *func)
 
        priv = sdio_get_drvdata(func);
 
-       LOG_INFO(priv, IRQ, "enter iwmct_irq\n");
+       LOG_TRACE(priv, IRQ, "enter iwmct_irq\n");
 
        /* read the function's status register */
        val = sdio_readb(func, IWMC_SDIO_INTR_STATUS_ADDR, &ret);
 
-       LOG_INFO(priv, IRQ, "iir value = %d, ret=%d\n", val, ret);
+       LOG_TRACE(priv, IRQ, "iir value = %d, ret=%d\n", val, ret);
 
        if (!val) {
                LOG_ERROR(priv, IRQ, "iir = 0, exiting ISR\n");
@@ -372,7 +363,7 @@ static void iwmct_irq(struct sdio_func *func)
 
        queue_work(priv->wq, &priv->isr_worker);
 
-       LOG_INFO(priv, IRQ, "exit iwmct_irq\n");
+       LOG_TRACE(priv, IRQ, "exit iwmct_irq\n");
 
        return;
 
@@ -660,7 +651,7 @@ static int __init iwmct_init(void)
 
        /* Default log filter settings */
        iwmct_log_set_filter(LOG_SRC_ALL, LOG_SEV_FILTER_RUNTIME);
-       iwmct_log_set_filter(LOG_SRC_FW_MSG, LOG_SEV_FILTER_ALL);
+       iwmct_log_set_filter(LOG_SRC_FW_MSG, LOG_SEV_FW_FILTER_ALL);
        iwmct_log_set_fw_filter(LOG_SRC_ALL, FW_LOG_SEV_FILTER_RUNTIME);
 
        rc = sdio_register_driver(&iwmct_driver);