Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15e23124 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by John W. Linville
Browse files

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: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d463af4a

drivers/net/wireless/ath/wil6210/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static irqreturn_t wil6210_irq_misc_thread(int irq, void *cookie) 
	}



	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;

drivers/net/wireless/ath/wil6210/main.c

+2 −2
Original line number Diff line number Diff line
@@ -363,8 +363,8 @@ static int wil_wait_for_fw_ready(struct wil6210_priv *wil) 
		wil_err(wil, "Firmware not ready\n");

		return -ETIME;

	} else {

		wil_dbg_misc(wil, "FW ready after %d ms\n",

			     jiffies_to_msecs(to-left));

		wil_info(wil, "FW ready after %d ms. HW version 0x%08x\n",

			 jiffies_to_msecs(to-left), wil->hw_version);

	}

	return 0;

}

drivers/net/wireless/ath/wil6210/pcie_bus.c

+0 −2
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil) 
	if (rc)

		goto release_irq;



	wil_info(wil, "HW version: 0x%08x\n", wil->hw_version);



	return 0;



 release_irq:

drivers/net/wireless/ath/wil6210/wmi.c

+4 −4
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int __wmi_send(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len) 
	might_sleep();



	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;

	}
@@ -276,7 +276,7 @@ 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->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);



	if (!is_valid_ether_addr(ndev->dev_addr)) {
@@ -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,

			     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);

	/* reuse wmi_ready for the firmware ready indication */