Commit e3f16965 authored by Chris Park's avatar Chris Park Committed by Greg Kroah-Hartman

staging: wilc1000: remove unnecessary log message using GENERIC_DBG tag

This patch remove unnecessary log message using GENERIC_DBG tag.
Needed log messages has changed netdev_dbg from PRINT_D.
And removes variables that were used to log message.
Signed-off-by: default avatarChris Park <chris.park@atmel.com>
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c9f75c30
...@@ -445,7 +445,6 @@ static s32 handle_set_mac_address(struct wilc_vif *vif, ...@@ -445,7 +445,6 @@ static s32 handle_set_mac_address(struct wilc_vif *vif,
wid.type = WID_STR; wid.type = WID_STR;
wid.val = mac_buf; wid.val = mac_buf;
wid.size = ETH_ALEN; wid.size = ETH_ALEN;
PRINT_D(GENERIC_DBG, "mac addr = :%pM\n", wid.val);
result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
...@@ -800,15 +799,12 @@ static s32 Handle_Scan(struct wilc_vif *vif, ...@@ -800,15 +799,12 @@ static s32 Handle_Scan(struct wilc_vif *vif,
if ((hif_drv->hif_state >= HOST_IF_SCANNING) && if ((hif_drv->hif_state >= HOST_IF_SCANNING) &&
(hif_drv->hif_state < HOST_IF_CONNECTED)) { (hif_drv->hif_state < HOST_IF_CONNECTED)) {
PRINT_D(GENERIC_DBG, "Don't scan already in [%d] state\n",
hif_drv->hif_state);
PRINT_ER("Already scan\n"); PRINT_ER("Already scan\n");
result = -EBUSY; result = -EBUSY;
goto ERRORHANDLER; goto ERRORHANDLER;
} }
if (wilc_optaining_ip || wilc_connecting) { if (wilc_optaining_ip || wilc_connecting) {
PRINT_D(GENERIC_DBG, "[handle_scan]: Don't do obss scan until IP adresss is obtained\n");
PRINT_ER("Don't do obss scan\n"); PRINT_ER("Don't do obss scan\n");
result = -EBUSY; result = -EBUSY;
goto ERRORHANDLER; goto ERRORHANDLER;
...@@ -915,7 +911,6 @@ static s32 Handle_ScanDone(struct wilc_vif *vif, ...@@ -915,7 +911,6 @@ static s32 Handle_ScanDone(struct wilc_vif *vif,
struct host_if_drv *hif_drv = vif->hif_drv; struct host_if_drv *hif_drv = vif->hif_drv;
if (enuEvent == SCAN_EVENT_ABORTED) { if (enuEvent == SCAN_EVENT_ABORTED) {
PRINT_D(GENERIC_DBG, "Abort running scan\n");
u8abort_running_scan = 1; u8abort_running_scan = 1;
wid.id = (u16)WID_ABORT_RUNNING_SCAN; wid.id = (u16)WID_ABORT_RUNNING_SCAN;
wid.type = WID_CHAR; wid.type = WID_CHAR;
...@@ -956,8 +951,6 @@ static s32 Handle_Connect(struct wilc_vif *vif, ...@@ -956,8 +951,6 @@ static s32 Handle_Connect(struct wilc_vif *vif,
struct join_bss_param *ptstrJoinBssParam; struct join_bss_param *ptstrJoinBssParam;
struct host_if_drv *hif_drv = vif->hif_drv; struct host_if_drv *hif_drv = vif->hif_drv;
PRINT_D(GENERIC_DBG, "Handling connect request\n");
if (memcmp(pstrHostIFconnectAttr->bssid, wilc_connected_ssid, ETH_ALEN) == 0) { if (memcmp(pstrHostIFconnectAttr->bssid, wilc_connected_ssid, ETH_ALEN) == 0) {
result = 0; result = 0;
PRINT_ER("Trying to connect to an already connected AP, Discard connect request\n"); PRINT_ER("Trying to connect to an already connected AP, Discard connect request\n");
...@@ -1149,13 +1142,9 @@ static s32 Handle_Connect(struct wilc_vif *vif, ...@@ -1149,13 +1142,9 @@ static s32 Handle_Connect(struct wilc_vif *vif,
join_req_vif = vif; join_req_vif = vif;
} }
if (pstrHostIFconnectAttr->bssid) { if (pstrHostIFconnectAttr->bssid)
memcpy(wilc_connected_ssid, memcpy(wilc_connected_ssid,
pstrHostIFconnectAttr->bssid, ETH_ALEN); pstrHostIFconnectAttr->bssid, ETH_ALEN);
PRINT_D(GENERIC_DBG, "save Bssid = %pM\n",
pstrHostIFconnectAttr->bssid);
PRINT_D(GENERIC_DBG, "save bssid = %pM\n", wilc_connected_ssid);
}
result = wilc_send_config_pkt(vif, SET_CFG, strWIDList, result = wilc_send_config_pkt(vif, SET_CFG, strWIDList,
u32WidsCount, u32WidsCount,
...@@ -1165,7 +1154,6 @@ static s32 Handle_Connect(struct wilc_vif *vif, ...@@ -1165,7 +1154,6 @@ static s32 Handle_Connect(struct wilc_vif *vif,
result = -EFAULT; result = -EFAULT;
goto ERRORHANDLER; goto ERRORHANDLER;
} else { } else {
PRINT_D(GENERIC_DBG, "set HOST_IF_WAITING_CONN_RESP\n");
hif_drv->hif_state = HOST_IF_WAITING_CONN_RESP; hif_drv->hif_state = HOST_IF_WAITING_CONN_RESP;
} }
...@@ -1443,8 +1431,6 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, ...@@ -1443,8 +1431,6 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
PRINT_ER("Driver handler is NULL\n"); PRINT_ER("Driver handler is NULL\n");
return -ENODEV; return -ENODEV;
} }
PRINT_D(GENERIC_DBG, "Current State = %d,Received state = %d\n",
hif_drv->hif_state, pstrRcvdGnrlAsyncInfo->buffer[7]);
if ((hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) || if ((hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) ||
(hif_drv->hif_state == HOST_IF_CONNECTED) || (hif_drv->hif_state == HOST_IF_CONNECTED) ||
...@@ -1548,7 +1534,6 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, ...@@ -1548,7 +1534,6 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
hif_drv->hif_state = HOST_IF_CONNECTED; hif_drv->hif_state = HOST_IF_CONNECTED;
PRINT_D(GENERIC_DBG, "Obtaining an IP, Disable Scan\n");
wilc_optaining_ip = true; wilc_optaining_ip = true;
mod_timer(&wilc_during_ip_timer, mod_timer(&wilc_during_ip_timer,
jiffies + msecs_to_jiffies(10000)); jiffies + msecs_to_jiffies(10000));
...@@ -2421,19 +2406,16 @@ static int Handle_RemainOnChan(struct wilc_vif *vif, ...@@ -2421,19 +2406,16 @@ static int Handle_RemainOnChan(struct wilc_vif *vif,
} }
if (hif_drv->usr_scan_req.scan_result) { if (hif_drv->usr_scan_req.scan_result) {
PRINT_INFO(GENERIC_DBG, "Required to remain on chan while scanning return\n");
hif_drv->remain_on_ch_pending = 1; hif_drv->remain_on_ch_pending = 1;
result = -EBUSY; result = -EBUSY;
goto ERRORHANDLER; goto ERRORHANDLER;
} }
if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) { if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) {
PRINT_INFO(GENERIC_DBG, "Required to remain on chan while connecting return\n");
result = -EBUSY; result = -EBUSY;
goto ERRORHANDLER; goto ERRORHANDLER;
} }
if (wilc_optaining_ip || wilc_connecting) { if (wilc_optaining_ip || wilc_connecting) {
PRINT_D(GENERIC_DBG, "[handle_scan]: Don't do obss scan until IP adresss is obtained\n");
result = -EBUSY; result = -EBUSY;
goto ERRORHANDLER; goto ERRORHANDLER;
} }
...@@ -2541,7 +2523,7 @@ static u32 Handle_ListenStateExpired(struct wilc_vif *vif, ...@@ -2541,7 +2523,7 @@ static u32 Handle_ListenStateExpired(struct wilc_vif *vif,
} }
P2P_LISTEN_STATE = 0; P2P_LISTEN_STATE = 0;
} else { } else {
PRINT_D(GENERIC_DBG, "Not in listen state\n"); netdev_dbg(vif->ndev, "Not in listen state\n");
result = -EFAULT; result = -EFAULT;
} }
...@@ -2635,12 +2617,6 @@ static s32 Handle_DelAllRxBASessions(struct wilc_vif *vif, ...@@ -2635,12 +2617,6 @@ static s32 Handle_DelAllRxBASessions(struct wilc_vif *vif,
struct wid wid; struct wid wid;
char *ptr = NULL; char *ptr = NULL;
PRINT_D(GENERIC_DBG, "Delete Block Ack session with\nBSSID = %.2x:%.2x:%.2x\nTID=%d\n",
strHostIfBASessionInfo->bssid[0],
strHostIfBASessionInfo->bssid[1],
strHostIfBASessionInfo->bssid[2],
strHostIfBASessionInfo->tid);
wid.id = (u16)WID_DEL_ALL_RX_BA; wid.id = (u16)WID_DEL_ALL_RX_BA;
wid.type = WID_STR; wid.type = WID_STR;
wid.val = kmalloc(BLOCK_ACK_REQ_SIZE, GFP_KERNEL); wid.val = kmalloc(BLOCK_ACK_REQ_SIZE, GFP_KERNEL);
...@@ -2711,13 +2687,10 @@ static int hostIFthread(void *pvArg) ...@@ -2711,13 +2687,10 @@ static int hostIFthread(void *pvArg)
while (1) { while (1) {
wilc_mq_recv(&hif_msg_q, &msg, sizeof(struct host_if_msg), &u32Ret); wilc_mq_recv(&hif_msg_q, &msg, sizeof(struct host_if_msg), &u32Ret);
vif = msg.vif; vif = msg.vif;
if (msg.id == HOST_IF_MSG_EXIT) { if (msg.id == HOST_IF_MSG_EXIT)
PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n");
break; break;
}
if ((!wilc_initialized)) { if ((!wilc_initialized)) {
PRINT_D(GENERIC_DBG, "--WAIT--");
usleep_range(200 * 1000, 200 * 1000); usleep_range(200 * 1000, 200 * 1000);
wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg)); wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
continue; continue;
...@@ -3318,9 +3291,6 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid, ...@@ -3318,9 +3291,6 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,
} }
if (hif_drv->hif_state < HOST_IF_CONNECTING) if (hif_drv->hif_state < HOST_IF_CONNECTING)
hif_drv->hif_state = HOST_IF_CONNECTING; hif_drv->hif_state = HOST_IF_CONNECTING;
else
PRINT_D(GENERIC_DBG, "Don't set state to 'connecting' : %d\n",
hif_drv->hif_state);
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg)); result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
if (result) { if (result) {
...@@ -3870,8 +3840,6 @@ void wilc_scan_complete_received(struct wilc *wilc, u8 *pu8Buffer, ...@@ -3870,8 +3840,6 @@ void wilc_scan_complete_received(struct wilc *wilc, u8 *pu8Buffer,
return; return;
hif_drv = vif->hif_drv; hif_drv = vif->hif_drv;
PRINT_D(GENERIC_DBG, "Scan notification received %p\n", hif_drv);
if (!hif_drv || hif_drv == terminated_handle) if (!hif_drv || hif_drv == terminated_handle)
return; return;
...@@ -4341,10 +4309,6 @@ static void *host_int_ParseJoinBssParam(struct network_info *ptstrNetworkInfo) ...@@ -4341,10 +4309,6 @@ static void *host_int_ParseJoinBssParam(struct network_info *ptstrNetworkInfo)
pNewJoinBssParam->opp_enabled = 0; pNewJoinBssParam->opp_enabled = 0;
} }
PRINT_D(GENERIC_DBG, "P2P Dump\n");
for (i = 0; i < pu8IEs[index + 7]; i++)
PRINT_D(GENERIC_DBG, " %x\n", pu8IEs[index + 9 + i]);
pNewJoinBssParam->cnt = pu8IEs[index + 11]; pNewJoinBssParam->cnt = pu8IEs[index + 11];
u16P2P_count = index + 12; u16P2P_count = index + 12;
......
...@@ -253,8 +253,6 @@ void wilc_mac_indicate(struct wilc *wilc, int flag) ...@@ -253,8 +253,6 @@ void wilc_mac_indicate(struct wilc *wilc, int flag)
} else { } else {
wilc->mac_status = status; wilc->mac_status = status;
} }
} else if (flag == WILC_MAC_INDICATE_SCAN) {
PRINT_D(GENERIC_DBG, "Scanning ...\n");
} }
} }
......
...@@ -2,14 +2,12 @@ ...@@ -2,14 +2,12 @@
#define LINUX_WLAN_COMMON_H #define LINUX_WLAN_COMMON_H
enum debug_region { enum debug_region {
Generic_debug = 0, Hostapd_debug = 0,
Hostapd_debug,
CFG80211_debug, CFG80211_debug,
Init_debug, Init_debug,
COMP = 0xFFFFFFFF, COMP = 0xFFFFFFFF,
}; };
#define GENERIC_DBG (1 << Generic_debug)
#define HOSTAPD_DBG (1 << Hostapd_debug) #define HOSTAPD_DBG (1 << Hostapd_debug)
#define CFG80211_DBG (1 << CFG80211_debug) #define CFG80211_DBG (1 << CFG80211_debug)
#define INIT_DBG (1 << Init_debug) #define INIT_DBG (1 << Init_debug)
......
...@@ -24,9 +24,9 @@ static struct dentry *wilc_dir; ...@@ -24,9 +24,9 @@ static struct dentry *wilc_dir;
* -------------------------------------------------------------------------------- * --------------------------------------------------------------------------------
*/ */
#define DBG_REGION_ALL (GENERIC_DBG | HOSTAPD_DBG | CFG80211_DBG | INIT_DBG) #define DBG_REGION_ALL (HOSTAPD_DBG | CFG80211_DBG | INIT_DBG)
#define DBG_LEVEL_ALL (DEBUG | INFO | WRN | ERR) #define DBG_LEVEL_ALL (DEBUG | INFO | WRN | ERR)
atomic_t WILC_REGION = ATOMIC_INIT(INIT_DBG | GENERIC_DBG | CFG80211_DBG | atomic_t WILC_REGION = ATOMIC_INIT(INIT_DBG | CFG80211_DBG |
HOSTAPD_DBG); HOSTAPD_DBG);
EXPORT_SYMBOL_GPL(WILC_REGION); EXPORT_SYMBOL_GPL(WILC_REGION);
atomic_t WILC_DEBUG_LEVEL = ATOMIC_INIT(ERR); atomic_t WILC_DEBUG_LEVEL = ATOMIC_INIT(ERR);
...@@ -136,7 +136,7 @@ struct wilc_debugfs_info_t { ...@@ -136,7 +136,7 @@ struct wilc_debugfs_info_t {
static struct wilc_debugfs_info_t debugfs_info[] = { static struct wilc_debugfs_info_t debugfs_info[] = {
{ "wilc_debug_level", 0666, (DEBUG | ERR), FOPS(NULL, wilc_debug_level_read, wilc_debug_level_write, NULL), }, { "wilc_debug_level", 0666, (DEBUG | ERR), FOPS(NULL, wilc_debug_level_read, wilc_debug_level_write, NULL), },
{ "wilc_debug_region", 0666, (INIT_DBG | GENERIC_DBG | CFG80211_DBG), FOPS(NULL, wilc_debug_region_read, wilc_debug_region_write, NULL), }, { "wilc_debug_region", 0666, (INIT_DBG | CFG80211_DBG), FOPS(NULL, wilc_debug_region_read, wilc_debug_region_write, NULL), },
}; };
static int __init wilc_debugfs_init(void) static int __init wilc_debugfs_init(void)
......
...@@ -713,8 +713,6 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) ...@@ -713,8 +713,6 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
break; break;
if (entries == 0) { if (entries == 0) {
PRINT_WRN(GENERIC_DBG, "[wilc txq]: no more buffer in the chip (reg: %08x), retry later [[ %d, %x ]]\n", reg, i, vmm_table[i - 1]);
ret = wilc->hif_func->hif_read_reg(wilc, WILC_HOST_TX_CTRL, &reg); ret = wilc->hif_func->hif_read_reg(wilc, WILC_HOST_TX_CTRL, &reg);
if (!ret) if (!ret)
break; break;
......
...@@ -270,13 +270,12 @@ static int wilc_wlan_cfg_set_bin(u8 *frame, u32 offset, u16 id, u8 *b, u32 size) ...@@ -270,13 +270,12 @@ static int wilc_wlan_cfg_set_bin(u8 *frame, u32 offset, u16 id, u8 *b, u32 size)
static void wilc_wlan_parse_response_frame(u8 *info, int size) static void wilc_wlan_parse_response_frame(u8 *info, int size)
{ {
u32 wid, len = 0, i = 0; u32 wid, len = 0, i = 0;
static int seq;
while (size > 0) { while (size > 0) {
i = 0; i = 0;
wid = info[0] | (info[1] << 8); wid = info[0] | (info[1] << 8);
wid = cpu_to_le32(wid); wid = cpu_to_le32(wid);
PRINT_INFO(GENERIC_DBG, "Processing response for %d seq %d\n", wid, seq++);
switch ((wid >> 12) & 0x7) { switch ((wid >> 12) & 0x7) {
case WID_CHAR: case WID_CHAR:
do { do {
...@@ -329,10 +328,6 @@ static void wilc_wlan_parse_response_frame(u8 *info, int size) ...@@ -329,10 +328,6 @@ static void wilc_wlan_parse_response_frame(u8 *info, int size)
if (wid == WID_SITE_SURVEY_RESULTS) { if (wid == WID_SITE_SURVEY_RESULTS) {
static int toggle; static int toggle;
PRINT_INFO(GENERIC_DBG, "Site survey results received[%d]\n",
size);
PRINT_INFO(GENERIC_DBG, "Site survey results value[%d]toggle[%d]\n", size, toggle);
i += toggle; i += toggle;
toggle ^= 1; toggle ^= 1;
} }
...@@ -361,7 +356,7 @@ static int wilc_wlan_parse_info_frame(u8 *info, int size) ...@@ -361,7 +356,7 @@ static int wilc_wlan_parse_info_frame(u8 *info, int size)
wid = info[0] | (info[1] << 8); wid = info[0] | (info[1] << 8);
len = info[2]; len = info[2];
PRINT_INFO(GENERIC_DBG, "Status Len = %d Id= %d\n", len, wid);
if ((len == 1) && (wid == WID_STATUS)) { if ((len == 1) && (wid == WID_STATUS)) {
pd->mac_status = info[3]; pd->mac_status = info[3];
type = WILC_CFG_RSP_STATUS; type = WILC_CFG_RSP_STATUS;
...@@ -475,8 +470,6 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size) ...@@ -475,8 +470,6 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size)
if (g_cfg_str[i].id == WID_SITE_SURVEY_RESULTS) { if (g_cfg_str[i].id == WID_SITE_SURVEY_RESULTS) {
static int toggle; static int toggle;
PRINT_INFO(GENERIC_DBG, "Site survey results value[%d]\n",
size);
i += toggle; i += toggle;
toggle ^= 1; toggle ^= 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment