p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wil6210: fix printouts for better readability 

Reshuffle prints to consolidate firmware/hardware information
report upon card init

Convert print for unhandled MISC ISR bits to "debug" - it is
normal situation and not an "error"

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Vladimir Kondratiev 2014-04-08 11:36:16 +03:00 committed by John W. Linville
parent d463af4a1c
commit 15e23124ce
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/wil6210/interrupt.c
View File

@ -338,7 +338,7 @@ static irqreturn_t wil6210_irq_misc_thread(int irq, void *cookie)
} }
if (isr) if (isr)
wil_err(wil, "un-handled MISC ISR bits 0x%08x\n", isr); wil_dbg_irq(wil, "un-handled MISC ISR bits 0x%08x\n", isr);
wil->isr_misc = 0; wil->isr_misc = 0;

4
drivers/net/wireless/ath/wil6210/main.c
View File

@ -363,8 +363,8 @@ static int wil_wait_for_fw_ready(struct wil6210_priv *wil)
wil_err(wil, "Firmware not ready\n"); wil_err(wil, "Firmware not ready\n");
return -ETIME; return -ETIME;
} else { } else {
wil_dbg_misc(wil, "FW ready after %d ms\n", wil_info(wil, "FW ready after %d ms. HW version 0x%08x\n",
jiffies_to_msecs(to-left)); jiffies_to_msecs(to-left), wil->hw_version);
} }
return 0; return 0;
} }

2
drivers/net/wireless/ath/wil6210/pcie_bus.c
View File

@ -74,8 +74,6 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil)
if (rc) if (rc)
goto release_irq; goto release_irq;
wil_info(wil, "HW version: 0x%08x\n", wil->hw_version);
return 0; return 0;
release_irq: release_irq:

8
drivers/net/wireless/ath/wil6210/wmi.c
View File

@ -192,7 +192,7 @@ static int __wmi_send(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len)
might_sleep(); might_sleep();
if (!test_bit(wil_status_fwready, &wil->status)) { if (!test_bit(wil_status_fwready, &wil->status)) {
wil_err(wil, "FW not ready\n"); wil_err(wil, "WMI: cannot send command while FW not ready\n");
return -EAGAIN; return -EAGAIN;
} }
@ -276,8 +276,8 @@ static void wmi_evt_ready(struct wil6210_priv *wil, int id, void *d, int len)
wil->fw_version = le32_to_cpu(evt->sw_version); wil->fw_version = le32_to_cpu(evt->sw_version);
wil->n_mids = evt->numof_additional_mids; wil->n_mids = evt->numof_additional_mids;
wil_dbg_wmi(wil, "FW ver. %d; MAC %pM; %d MID's\n", wil->fw_version, wil_info(wil, "FW ver. %d; MAC %pM; %d MID's\n", wil->fw_version,
evt->mac, wil->n_mids); evt->mac, wil->n_mids);
if (!is_valid_ether_addr(ndev->dev_addr)) { if (!is_valid_ether_addr(ndev->dev_addr)) {
memcpy(ndev->dev_addr, evt->mac, ETH_ALEN); memcpy(ndev->dev_addr, evt->mac, ETH_ALEN);
@ -290,7 +290,7 @@ static void wmi_evt_ready(struct wil6210_priv *wil, int id, void *d, int len)
static void wmi_evt_fw_ready(struct wil6210_priv *wil, int id, void *d, static void wmi_evt_fw_ready(struct wil6210_priv *wil, int id, void *d,
int len) int len)
{ {
wil_dbg_wmi(wil, "WMI: FW ready\n"); wil_dbg_wmi(wil, "WMI: got FW ready event\n");
set_bit(wil_status_fwready, &wil->status); set_bit(wil_status_fwready, &wil->status);
/* reuse wmi_ready for the firmware ready indication */ /* reuse wmi_ready for the firmware ready indication */