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

Commit af3db60a authored by Lazar Alexei's avatar Lazar Alexei Committed by Kalle Valo
Browse files

wil6210: remove __func__ from debug printouts 



__func__ is automatically added to printouts by dynamic debug
mechanism and by wil_info/wil_err macros.
Remove __func__ from debug printouts to avoid duplication.

Signed-off-by: default avatarLazar Alexei <qca_ailizaro@qca.qualcomm.com>
Signed-off-by: default avatarMaya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent a351f2f5

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

+38 −41
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int wil_cfg80211_get_station(struct wiphy *wiphy, 


	int cid = wil_find_cid(wil, mac);



	wil_dbg_misc(wil, "%s(%pM) CID %d\n", __func__, mac, cid);

	wil_dbg_misc(wil, "get_station: %pM CID %d\n", mac, cid);

	if (cid < 0)

		return cid;
@@ -244,7 +244,7 @@ static int wil_cfg80211_dump_station(struct wiphy *wiphy, 
		return -ENOENT;



	ether_addr_copy(mac, wil->sta[cid].addr);

	wil_dbg_misc(wil, "%s(%pM) CID %d\n", __func__, mac, cid);

	wil_dbg_misc(wil, "dump_station: %pM CID %d\n", mac, cid);



	rc = wil_cid_fill_sinfo(wil, cid, sinfo);
@@ -261,16 +261,15 @@ wil_cfg80211_add_iface(struct wiphy *wiphy, const char *name, 
	struct net_device *ndev = wil_to_ndev(wil);

	struct wireless_dev *p2p_wdev;



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "add_iface\n");



	if (type != NL80211_IFTYPE_P2P_DEVICE) {

		wil_err(wil, "%s: unsupported iftype %d\n", __func__, type);

		wil_err(wil, "unsupported iftype %d\n", type);

		return ERR_PTR(-EINVAL);

	}



	if (wil->p2p_wdev) {

		wil_err(wil, "%s: P2P_DEVICE interface already created\n",

			__func__);

		wil_err(wil, "P2P_DEVICE interface already created\n");

		return ERR_PTR(-EINVAL);

	}
@@ -293,11 +292,10 @@ static int wil_cfg80211_del_iface(struct wiphy *wiphy, 
{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "del_iface\n");



	if (wdev != wil->p2p_wdev) {

		wil_err(wil, "%s: delete of incorrect interface 0x%p\n",

			__func__, wdev);

		wil_err(wil, "delete of incorrect interface 0x%p\n", wdev);

		return -EINVAL;

	}
@@ -315,7 +313,7 @@ static int wil_cfg80211_change_iface(struct wiphy *wiphy, 
	struct wireless_dev *wdev = wil_to_wdev(wil);

	int rc;



	wil_dbg_misc(wil, "%s() type=%d\n", __func__, type);

	wil_dbg_misc(wil, "change_iface: type=%d\n", type);



	if (netif_running(wil_to_ndev(wil)) && !wil_is_recovery_blocked(wil)) {

		wil_dbg_misc(wil, "interface is up. resetting...\n");
@@ -362,8 +360,7 @@ static int wil_cfg80211_scan(struct wiphy *wiphy, 
	uint i, n;

	int rc;



	wil_dbg_misc(wil, "%s(), wdev=0x%p iftype=%d\n",

		     __func__, wdev, wdev->iftype);

	wil_dbg_misc(wil, "scan: wdev=0x%p iftype=%d\n", wdev, wdev->iftype);



	/* check we are client side */

	switch (wdev->iftype) {
@@ -568,7 +565,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy, 
	int rc = 0;

	enum ieee80211_bss_type bss_type = IEEE80211_BSS_TYPE_ESS;



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "connect\n");

	wil_print_connect_params(wil, sme);



	if (test_bit(wil_status_fwconnecting, wil->status) ||
@@ -700,12 +697,11 @@ static int wil_cfg80211_disconnect(struct wiphy *wiphy, 
	int rc;

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);



	wil_dbg_misc(wil, "%s(reason=%d)\n", __func__, reason_code);

	wil_dbg_misc(wil, "disconnect: reason=%d\n", reason_code);



	if (!(test_bit(wil_status_fwconnecting, wil->status) ||

	      test_bit(wil_status_fwconnected, wil->status))) {

		wil_err(wil, "%s: Disconnect was called while disconnected\n",

			__func__);

		wil_err(wil, "Disconnect was called while disconnected\n");

		return 0;

	}
@@ -713,7 +709,7 @@ static int wil_cfg80211_disconnect(struct wiphy *wiphy, 
		      WMI_DISCONNECT_EVENTID, NULL, 0,

		      WIL6210_DISCONNECT_TO_MS);

	if (rc)

		wil_err(wil, "%s: disconnect error %d\n", __func__, rc);

		wil_err(wil, "disconnect error %d\n", rc);



	return rc;

}
@@ -761,7 +757,7 @@ int wil_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
	 * different from currently "listened" channel and fail if it is.

	 */



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "mgmt_tx\n");

	print_hex_dump_bytes("mgmt tx frame ", DUMP_PREFIX_OFFSET, buf, len);



	cmd = kmalloc(sizeof(*cmd) + len, GFP_KERNEL);
@@ -822,7 +818,7 @@ static enum wmi_key_usage wil_detect_key_usage(struct wil6210_priv *wil, 
			break;

		}

	}

	wil_dbg_misc(wil, "%s() -> %s\n", __func__, key_usage_str[rc]);

	wil_dbg_misc(wil, "detect_key_usage: -> %s\n", key_usage_str[rc]);



	return rc;

}
@@ -927,13 +923,13 @@ static int wil_cfg80211_add_key(struct wiphy *wiphy, 
		return -EINVAL;

	}



	wil_dbg_misc(wil, "%s(%pM %s[%d] PN %*phN)\n", __func__,

	wil_dbg_misc(wil, "add_key: %pM %s[%d] PN %*phN\n",

		     mac_addr, key_usage_str[key_usage], key_index,

		     params->seq_len, params->seq);



	if (IS_ERR(cs)) {

		wil_err(wil, "Not connected, %s(%pM %s[%d] PN %*phN)\n",

			__func__, mac_addr, key_usage_str[key_usage], key_index,

		wil_err(wil, "Not connected, %pM %s[%d] PN %*phN\n",

			mac_addr, key_usage_str[key_usage], key_index,

			params->seq_len, params->seq);

		return -EINVAL;

	}
@@ -942,8 +938,8 @@ static int wil_cfg80211_add_key(struct wiphy *wiphy, 


	if (params->seq && params->seq_len != IEEE80211_GCMP_PN_LEN) {

		wil_err(wil,

			"Wrong PN len %d, %s(%pM %s[%d] PN %*phN)\n",

			params->seq_len, __func__, mac_addr,

			"Wrong PN len %d, %pM %s[%d] PN %*phN\n",

			params->seq_len, mac_addr,

			key_usage_str[key_usage], key_index,

			params->seq_len, params->seq);

		return -EINVAL;
@@ -967,11 +963,11 @@ static int wil_cfg80211_del_key(struct wiphy *wiphy, 
	struct wil_sta_info *cs = wil_find_sta_by_key_usage(wil, key_usage,

							    mac_addr);



	wil_dbg_misc(wil, "%s(%pM %s[%d])\n", __func__, mac_addr,

	wil_dbg_misc(wil, "del_key: %pM %s[%d]\n", mac_addr,

		     key_usage_str[key_usage], key_index);



	if (IS_ERR(cs))

		wil_info(wil, "Not connected, %s(%pM %s[%d])\n", __func__,

		wil_info(wil, "Not connected, %pM %s[%d]\n",

			 mac_addr, key_usage_str[key_usage], key_index);



	if (!IS_ERR_OR_NULL(cs))
@@ -988,7 +984,7 @@ static int wil_cfg80211_set_default_key(struct wiphy *wiphy, 
{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);



	wil_dbg_misc(wil, "%s: entered\n", __func__);

	wil_dbg_misc(wil, "set_default_key: entered\n");

	return 0;

}
@@ -1001,8 +997,9 @@ static int wil_remain_on_channel(struct wiphy *wiphy, 
	struct wil6210_priv *wil = wiphy_to_wil(wiphy);

	int rc;



	wil_dbg_misc(wil, "%s() center_freq=%d, duration=%d iftype=%d\n",

		     __func__, chan->center_freq, duration, wdev->iftype);

	wil_dbg_misc(wil,

		     "remain_on_channel: center_freq=%d, duration=%d iftype=%d\n",

		     chan->center_freq, duration, wdev->iftype);



	rc = wil_p2p_listen(wil, wdev, duration, chan, cookie);

	return rc;
@@ -1014,7 +1011,7 @@ static int wil_cancel_remain_on_channel(struct wiphy *wiphy, 
{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "cancel_remain_on_channel\n");



	return wil_p2p_cancel_listen(wil, cookie);

}
@@ -1170,9 +1167,9 @@ static int _wil_cfg80211_start_ap(struct wiphy *wiphy, 
	if (pbss)

		wmi_nettype = WMI_NETTYPE_P2P;



	wil_dbg_misc(wil, "%s: is_go=%d\n", __func__, is_go);

	wil_dbg_misc(wil, "start_ap: is_go=%d\n", is_go);

	if (is_go && !pbss) {

		wil_err(wil, "%s: P2P GO must be in PBSS\n", __func__);

		wil_err(wil, "P2P GO must be in PBSS\n");

		return -ENOTSUPP;

	}
@@ -1227,7 +1224,7 @@ static int wil_cfg80211_change_beacon(struct wiphy *wiphy, 
	int rc;

	u32 privacy = 0;



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "change_beacon\n");

	wil_print_bcon_data(bcon);



	if (bcon->tail &&
@@ -1266,7 +1263,7 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy, 
	struct cfg80211_crypto_settings *crypto = &info->crypto;

	u8 hidden_ssid;



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "start_ap\n");



	if (!channel) {

		wil_err(wil, "AP: No channel???\n");
@@ -1317,7 +1314,7 @@ static int wil_cfg80211_stop_ap(struct wiphy *wiphy, 
{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "stop_ap\n");



	netif_carrier_off(ndev);

	wil_set_recovery_state(wil, fw_recovery_idle);
@@ -1361,7 +1358,7 @@ static int wil_cfg80211_del_station(struct wiphy *wiphy, 
{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);



	wil_dbg_misc(wil, "%s(%pM, reason=%d)\n", __func__, params->mac,

	wil_dbg_misc(wil, "del_station: %pM, reason=%d\n", params->mac,

		     params->reason_code);



	mutex_lock(&wil->mutex);
@@ -1466,7 +1463,7 @@ void wil_probe_client_flush(struct wil6210_priv *wil) 
{

	struct wil_probe_client_req *req, *t;



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "probe_client_flush\n");



	mutex_lock(&wil->probe_client_mutex);
@@ -1486,7 +1483,7 @@ static int wil_cfg80211_probe_client(struct wiphy *wiphy, 
	struct wil_probe_client_req *req;

	int cid = wil_find_cid(wil, peer);



	wil_dbg_misc(wil, "%s(%pM => CID %d)\n", __func__, peer, cid);

	wil_dbg_misc(wil, "probe_client: %pM => CID %d\n", peer, cid);



	if (cid < 0)

		return -ENOLINK;
@@ -1514,7 +1511,7 @@ static int wil_cfg80211_change_bss(struct wiphy *wiphy, 
	struct wil6210_priv *wil = wiphy_to_wil(wiphy);



	if (params->ap_isolate >= 0) {

		wil_dbg_misc(wil, "%s(ap_isolate %d => %d)\n", __func__,

		wil_dbg_misc(wil, "change_bss: ap_isolate %d => %d\n",

			     wil->ap_isolate, params->ap_isolate);

		wil->ap_isolate = params->ap_isolate;

	}
@@ -1527,7 +1524,7 @@ static int wil_cfg80211_start_p2p_device(struct wiphy *wiphy, 
{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);



	wil_dbg_misc(wil, "%s: entered\n", __func__);

	wil_dbg_misc(wil, "start_p2p_device: entered\n");

	wil->p2p.p2p_dev_started = 1;

	return 0;

}
@@ -1541,7 +1538,7 @@ static void wil_cfg80211_stop_p2p_device(struct wiphy *wiphy, 
	if (!p2p->p2p_dev_started)

		return;



	wil_dbg_misc(wil, "%s: entered\n", __func__);

	wil_dbg_misc(wil, "stop_p2p_device: entered\n");

	mutex_lock(&wil->mutex);

	mutex_lock(&wil->p2p_wdev_mutex);

	wil_p2p_stop_radio_operations(wil);

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

+2 −2
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ static ssize_t wil_write_file_txmgmt(struct file *file, const char __user *buf, 
	rc = wil_cfg80211_mgmt_tx(wiphy, wdev, &params, NULL);



	kfree(frame);

	wil_info(wil, "%s() -> %d\n", __func__, rc);

	wil_info(wil, "-> %d\n", rc);



	return len;

}
@@ -855,7 +855,7 @@ static ssize_t wil_write_file_wmi(struct file *file, const char __user *buf, 
	rc1 = wmi_send(wil, cmdid, cmd, cmdlen);

	kfree(wmi);



	wil_info(wil, "%s(0x%04x[%d]) -> %d\n", __func__, cmdid, cmdlen, rc1);

	wil_info(wil, "0x%04x[%d] -> %d\n", cmdid, cmdlen, rc1);



	return rc;

}

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

+5 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014 Qualcomm Atheros, Inc.

 * Copyright (c) 2014,2017 Qualcomm Atheros, Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above
@@ -27,7 +27,7 @@ static int wil_ethtoolops_begin(struct net_device *ndev) 


	mutex_lock(&wil->mutex);



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "ethtoolops_begin\n");



	return 0;

}
@@ -36,7 +36,7 @@ static void wil_ethtoolops_complete(struct net_device *ndev) 
{

	struct wil6210_priv *wil = ndev_to_wil(ndev);



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "ethtoolops_complete\n");



	mutex_unlock(&wil->mutex);

}
@@ -48,7 +48,7 @@ static int wil_ethtoolops_get_coalesce(struct net_device *ndev, 
	u32 tx_itr_en, tx_itr_val = 0;

	u32 rx_itr_en, rx_itr_val = 0;



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "ethtoolops_get_coalesce\n");



	tx_itr_en = wil_r(wil, RGF_DMA_ITR_TX_CNT_CTL);

	if (tx_itr_en & BIT_DMA_ITR_TX_CNT_CTL_EN)
@@ -68,7 +68,7 @@ static int wil_ethtoolops_set_coalesce(struct net_device *ndev, 
{

	struct wil6210_priv *wil = ndev_to_wil(ndev);



	wil_dbg_misc(wil, "%s(rx %d usec, tx %d usec)\n", __func__,

	wil_dbg_misc(wil, "ethtoolops_set_coalesce: rx %d usec, tx %d usec\n",

		     cp->rx_coalesce_usecs, cp->tx_coalesce_usecs);



	if (wil->wdev->iftype == NL80211_IFTYPE_MONITOR) {

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

+15 −15
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2016 Qualcomm Atheros, Inc.

 * Copyright (c) 2012-2017 Qualcomm Atheros, Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above
@@ -94,7 +94,7 @@ static void wil6210_mask_irq_rx(struct wil6210_priv *wil) 


static void wil6210_mask_irq_misc(struct wil6210_priv *wil, bool mask_halp)

{

	wil_dbg_irq(wil, "%s: mask_halp(%s)\n", __func__,

	wil_dbg_irq(wil, "mask_irq_misc: mask_halp(%s)\n",

		    mask_halp ? "true" : "false");



	wil_w(wil, RGF_DMA_EP_MISC_ICR + offsetof(struct RGF_ICR, IMS),
@@ -103,7 +103,7 @@ static void wil6210_mask_irq_misc(struct wil6210_priv *wil, bool mask_halp) 


void wil6210_mask_halp(struct wil6210_priv *wil)

{

	wil_dbg_irq(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "mask_halp\n");



	wil_w(wil, RGF_DMA_EP_MISC_ICR + offsetof(struct RGF_ICR, IMS),

	      BIT_DMA_EP_MISC_ICR_HALP);
@@ -111,7 +111,7 @@ void wil6210_mask_halp(struct wil6210_priv *wil) 


static void wil6210_mask_irq_pseudo(struct wil6210_priv *wil)

{

	wil_dbg_irq(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "mask_irq_pseudo\n");



	wil_w(wil, RGF_DMA_PSEUDO_CAUSE_MASK_SW, WIL6210_IRQ_DISABLE);
@@ -134,7 +134,7 @@ void wil6210_unmask_irq_rx(struct wil6210_priv *wil) 


static void wil6210_unmask_irq_misc(struct wil6210_priv *wil, bool unmask_halp)

{

	wil_dbg_irq(wil, "%s: unmask_halp(%s)\n", __func__,

	wil_dbg_irq(wil, "unmask_irq_misc: unmask_halp(%s)\n",

		    unmask_halp ? "true" : "false");



	wil_w(wil, RGF_DMA_EP_MISC_ICR + offsetof(struct RGF_ICR, IMC),
@@ -143,7 +143,7 @@ static void wil6210_unmask_irq_misc(struct wil6210_priv *wil, bool unmask_halp) 


static void wil6210_unmask_halp(struct wil6210_priv *wil)

{

	wil_dbg_irq(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "unmask_halp\n");



	wil_w(wil, RGF_DMA_EP_MISC_ICR + offsetof(struct RGF_ICR, IMC),

	      BIT_DMA_EP_MISC_ICR_HALP);
@@ -151,7 +151,7 @@ static void wil6210_unmask_halp(struct wil6210_priv *wil) 


static void wil6210_unmask_irq_pseudo(struct wil6210_priv *wil)

{

	wil_dbg_irq(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "unmask_irq_pseudo\n");



	set_bit(wil_status_irqen, wil->status);
@@ -160,7 +160,7 @@ static void wil6210_unmask_irq_pseudo(struct wil6210_priv *wil) 


void wil_mask_irq(struct wil6210_priv *wil)

{

	wil_dbg_irq(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "mask_irq\n");



	wil6210_mask_irq_tx(wil);

	wil6210_mask_irq_rx(wil);
@@ -170,7 +170,7 @@ void wil_mask_irq(struct wil6210_priv *wil) 


void wil_unmask_irq(struct wil6210_priv *wil)

{

	wil_dbg_irq(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "unmask_irq\n");



	wil_w(wil, RGF_DMA_EP_RX_ICR + offsetof(struct RGF_ICR, ICC),

	      WIL_ICR_ICC_VALUE);
@@ -187,7 +187,7 @@ void wil_unmask_irq(struct wil6210_priv *wil) 


void wil_configure_interrupt_moderation(struct wil6210_priv *wil)

{

	wil_dbg_irq(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "configure_interrupt_moderation\n");



	/* disable interrupt moderation for monitor

	 * to get better timestamp precision
@@ -400,7 +400,7 @@ static irqreturn_t wil6210_irq_misc(int irq, void *cookie) 
	}



	if (isr & BIT_DMA_EP_MISC_ICR_HALP) {

		wil_dbg_irq(wil, "%s: HALP IRQ invoked\n", __func__);

		wil_dbg_irq(wil, "irq_misc: HALP IRQ invoked\n");

		wil6210_mask_halp(wil);

		isr &= ~BIT_DMA_EP_MISC_ICR_HALP;

		complete(&wil->halp.comp);
@@ -599,7 +599,7 @@ void wil6210_clear_irq(struct wil6210_priv *wil) 


void wil6210_set_halp(struct wil6210_priv *wil)

{

	wil_dbg_irq(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "set_halp\n");



	wil_w(wil, RGF_DMA_EP_MISC_ICR + offsetof(struct RGF_ICR, ICS),

	      BIT_DMA_EP_MISC_ICR_HALP);
@@ -607,7 +607,7 @@ void wil6210_set_halp(struct wil6210_priv *wil) 


void wil6210_clear_halp(struct wil6210_priv *wil)

{

	wil_dbg_irq(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "clear_halp\n");



	wil_w(wil, RGF_DMA_EP_MISC_ICR + offsetof(struct RGF_ICR, ICR),

	      BIT_DMA_EP_MISC_ICR_HALP);
@@ -618,7 +618,7 @@ int wil6210_init_irq(struct wil6210_priv *wil, int irq, bool use_msi) 
{

	int rc;



	wil_dbg_misc(wil, "%s(%s)\n", __func__, use_msi ? "MSI" : "INTx");

	wil_dbg_misc(wil, "init_irq: %s\n", use_msi ? "MSI" : "INTx");



	rc = request_threaded_irq(irq, wil6210_hardirq,

				  wil6210_thread_irq,
@@ -629,7 +629,7 @@ int wil6210_init_irq(struct wil6210_priv *wil, int irq, bool use_msi) 


void wil6210_fini_irq(struct wil6210_priv *wil, int irq)

{

	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "fini_irq:\n");



	wil_mask_irq(wil);

	free_irq(irq, wil);

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

+23 −27
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ __acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock) 
	struct wil_sta_info *sta = &wil->sta[cid];



	might_sleep();

	wil_dbg_misc(wil, "%s(CID %d, status %d)\n", __func__, cid,

		     sta->status);

	wil_dbg_misc(wil, "disconnect_cid: CID %d, status %d\n",

		     cid, sta->status);

	/* inform upper/lower layers */

	if (sta->status != wil_sta_unused) {

		if (!from_event) {
@@ -241,7 +241,7 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid, 
		return;



	might_sleep();

	wil_info(wil, "%s(bssid=%pM, reason=%d, ev%s)\n", __func__, bssid,

	wil_info(wil, "bssid=%pM, reason=%d, ev%s\n", bssid,

		 reason_code, from_event ? "+" : "-");



	/* Cases are:
@@ -351,7 +351,7 @@ static int wil_wait_for_recovery(struct wil6210_priv *wil) 


void wil_set_recovery_state(struct wil6210_priv *wil, int state)

{

	wil_dbg_misc(wil, "%s(%d -> %d)\n", __func__,

	wil_dbg_misc(wil, "set_recovery_state: %d -> %d\n",

		     wil->recovery_state, state);



	wil->recovery_state = state;
@@ -493,7 +493,7 @@ int wil_priv_init(struct wil6210_priv *wil) 
{

	uint i;



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "priv_init\n");



	memset(wil->sta, 0, sizeof(wil->sta));

	for (i = 0; i < WIL6210_MAX_CID; i++)
@@ -568,7 +568,7 @@ int wil_priv_init(struct wil6210_priv *wil) 
void wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid,

			u16 reason_code, bool from_event)

{

	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "disconnect\n");



	del_timer_sync(&wil->connect_timer);

	_wil6210_disconnect(wil, bssid, reason_code, from_event);
@@ -576,7 +576,7 @@ void wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid, 


void wil_priv_deinit(struct wil6210_priv *wil)

{

	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "priv_deinit\n");



	wil_set_recovery_state(wil, fw_recovery_idle);

	del_timer_sync(&wil->scan_timer);
@@ -609,7 +609,7 @@ static inline void wil_release_cpu(struct wil6210_priv *wil) 


static void wil_set_oob_mode(struct wil6210_priv *wil, bool enable)

{

	wil_info(wil, "%s: enable=%d\n", __func__, enable);

	wil_info(wil, "enable=%d\n", enable);

	if (enable)

		wil_s(wil, RGF_USER_USAGE_6, BIT_USER_OOB_MODE);

	else
@@ -865,7 +865,7 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
{

	int rc;



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "reset\n");



	WARN_ON(!mutex_is_locked(&wil->mutex));

	WARN_ON(test_bit(wil_status_napi_en, wil->status));
@@ -888,9 +888,8 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
		rc = wil->platform_ops.notify(wil->platform_handle,

					      WIL_PLATFORM_EVT_PRE_RESET);

		if (rc)

			wil_err(wil,

				"%s: PRE_RESET platform notify failed, rc %d\n",

				__func__, rc);

			wil_err(wil, "PRE_RESET platform notify failed, rc %d\n",

				rc);

	}



	set_bit(wil_status_resetting, wil->status);
@@ -980,8 +979,7 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
		/* check FW is responsive */

		rc = wmi_echo(wil);

		if (rc) {

			wil_err(wil, "%s: wmi_echo failed, rc %d\n",

				__func__, rc);

			wil_err(wil, "wmi_echo failed, rc %d\n", rc);

			return rc;

		}
@@ -991,9 +989,8 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
			rc = wil->platform_ops.notify(wil->platform_handle,

						      WIL_PLATFORM_EVT_FW_RDY);

			if (rc) {

				wil_err(wil,

					"%s: FW_RDY notify failed, rc %d\n",

					__func__, rc);

				wil_err(wil, "FW_RDY notify failed, rc %d\n",

					rc);

				rc = 0;

			}

		}
@@ -1077,7 +1074,7 @@ int wil_up(struct wil6210_priv *wil) 
{

	int rc;



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "up\n");



	mutex_lock(&wil->mutex);

	rc = __wil_up(wil);
@@ -1117,7 +1114,7 @@ int wil_down(struct wil6210_priv *wil) 
{

	int rc;



	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "down\n");



	wil_set_recovery_state(wil, fw_recovery_idle);

	mutex_lock(&wil->mutex);
@@ -1150,25 +1147,24 @@ void wil_halp_vote(struct wil6210_priv *wil) 


	mutex_lock(&wil->halp.lock);



	wil_dbg_irq(wil, "%s: start, HALP ref_cnt (%d)\n", __func__,

	wil_dbg_irq(wil, "halp_vote: start, HALP ref_cnt (%d)\n",

		    wil->halp.ref_cnt);



	if (++wil->halp.ref_cnt == 1) {

		wil6210_set_halp(wil);

		rc = wait_for_completion_timeout(&wil->halp.comp, to_jiffies);

		if (!rc) {

			wil_err(wil, "%s: HALP vote timed out\n", __func__);

			wil_err(wil, "HALP vote timed out\n");

			/* Mask HALP as done in case the interrupt is raised */

			wil6210_mask_halp(wil);

		} else {

			wil_dbg_irq(wil,

				    "%s: HALP vote completed after %d ms\n",

				    __func__,

				    "halp_vote: HALP vote completed after %d ms\n",

				    jiffies_to_msecs(to_jiffies - rc));

		}

	}



	wil_dbg_irq(wil, "%s: end, HALP ref_cnt (%d)\n", __func__,

	wil_dbg_irq(wil, "halp_vote: end, HALP ref_cnt (%d)\n",

		    wil->halp.ref_cnt);



	mutex_unlock(&wil->halp.lock);
@@ -1180,15 +1176,15 @@ void wil_halp_unvote(struct wil6210_priv *wil) 


	mutex_lock(&wil->halp.lock);



	wil_dbg_irq(wil, "%s: start, HALP ref_cnt (%d)\n", __func__,

	wil_dbg_irq(wil, "halp_unvote: start, HALP ref_cnt (%d)\n",

		    wil->halp.ref_cnt);



	if (--wil->halp.ref_cnt == 0) {

		wil6210_clear_halp(wil);

		wil_dbg_irq(wil, "%s: HALP unvote\n", __func__);

		wil_dbg_irq(wil, "HALP unvote\n");

	}



	wil_dbg_irq(wil, "%s: end, HALP ref_cnt (%d)\n", __func__,

	wil_dbg_irq(wil, "halp_unvote:end, HALP ref_cnt (%d)\n",

		    wil->halp.ref_cnt);



	mutex_unlock(&wil->halp.lock);