There are few WILC_CATCH() uses that still remain. They are not needed
and can be removed.
Signed-off-by: Mike Rapoport <mike.rapop...@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 68 -----------------------
drivers/staging/wilc1000/wilc_msgqueue.c | 4 --
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 5 --
3 files changed, 77 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 0f23260..afb98d2 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2329,12 +2329,6 @@ static s32 Handle_RcvdNtwrkInfo(tstrWILC_WFIDrv
*drvHandler, tstrRcvdNetworkInfo
}
}
-
- WILC_CATCH(s32Error)
- {
-
- }
-
done:
/* Deallocate pstrRcvdNetworkInfo->pu8Buffer which was prevoisuly
allocated by the sending thread */
if (pstrRcvdNetworkInfo->pu8Buffer != NULL) {
@@ -2668,11 +2662,6 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv
*drvHandler, tstrRcvdGnrlAsy
}
- WILC_CATCH(s32Error)
- {
-
- }
-
/* Deallocate pstrRcvdGnrlAsyncInfo->pu8Buffer which was prevoisuly
allocated by the sending thread */
if (pstrRcvdGnrlAsyncInfo->pu8Buffer != NULL) {
kfree(pstrRcvdGnrlAsyncInfo->pu8Buffer);
@@ -4625,10 +4614,6 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8
u8keyIdx)
PRINT_ER("Error in sending message queue : Request to remove
WEP key\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
- WILC_CATCH(s32Error)
- {
-
- }
return s32Error;
}
@@ -4673,11 +4658,6 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv
*hWFIDrv, u8 u8Index)
PRINT_ER("Error in sending message queue : Default key
index\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
- WILC_CATCH(s32Error)
- {
-
- }
-
return s32Error;
}
@@ -4740,10 +4720,6 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv
*hWFIDrv, const u8 *pu8WepKey,
PRINT_ER("Error in sending message queue :WEP Key\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
- WILC_CATCH(s32Error)
- {
-
- }
return s32Error;
}
@@ -4816,10 +4792,6 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv
*hWFIDrv, const u8 *pu8WepKey, u
PRINT_ER("Error in sending message queue :WEP Key\n");
down(&(pstrWFIDrv->hSemTestKeyBlock));
- WILC_CATCH(s32Error)
- {
-
- }
return s32Error;
}
@@ -4918,11 +4890,6 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8
*pu8Ptk, u8 u8PtkKeylen,
down(&(pstrWFIDrv->hSemTestKeyBlock));
/* /////// */
- WILC_CATCH(s32Error)
- {
-
- }
-
return s32Error;
}
@@ -5018,10 +4985,6 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const
u8 *pu8RxGtk, u8 u8GtkKe
down(&(pstrWFIDrv->hSemTestKeyBlock));
/* /////// */
- WILC_CATCH(s32Error)
- {
-
- }
return s32Error;
}
@@ -5078,11 +5041,6 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv,
tstrHostIFpmkidAttr *pu8Pm
if (s32Error)
PRINT_ER(" Error in sending messagequeue: PMKID Info\n");
- WILC_CATCH(s32Error)
- {
-
- }
-
return s32Error;
}
@@ -5462,11 +5420,6 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8
*pu8bssid,
mod_timer(&pstrWFIDrv->hConnectTimer,
jiffies + msecs_to_jiffies(HOST_IF_CONNECT_TIMEOUT));
- WILC_CATCH(s32Error)
- {
-
- }
-
return s32Error;
}
@@ -5549,11 +5502,6 @@ s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16
u16ReasonCode)
down(&(pstrWFIDrv->hSemTestDisconnectBlock));
/* /////// */
- WILC_CATCH(s32Error)
- {
-
- }
-
return s32Error;
}
@@ -5842,10 +5790,6 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv,
u8 *pu8ChNo)
*pu8ChNo = gu8Chnl;
- WILC_CATCH(s32Error)
- {
- }
-
return s32Error;
@@ -5935,10 +5879,6 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv,
const u8 *mac, u32 *pu3
*pu32InactiveTime = gu32InactiveTime;
- WILC_CATCH(s32Error)
- {
- }
-
return s32Error;
}
#endif
@@ -6166,10 +6106,6 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8
u8ScanSource,
mod_timer(&pstrWFIDrv->hScanTimer,
jiffies + msecs_to_jiffies(HOST_IF_SCAN_TIMEOUT));
- WILC_CATCH(s32Error)
- {
-
- }
return s32Error;
}
@@ -6203,10 +6139,6 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv,
tstrCfgParamVal *pstrCfgParamVal)
s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg,
sizeof(tstrHostIFmsg));
- WILC_CATCH(s32Error)
- {
- }
-
return s32Error;
}
diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c
b/drivers/staging/wilc1000/wilc_msgqueue.c
index fd50f11..4337efc 100644
--- a/drivers/staging/wilc1000/wilc_msgqueue.c
+++ b/drivers/staging/wilc1000/wilc_msgqueue.c
@@ -168,9 +168,5 @@ int wilc_mq_recv(WILC_MsgQueueHandle *pHandle,
spin_unlock_irqrestore(&pHandle->strCriticalSection, flags);
}
- WILC_CATCH(s32RetStatus)
- {
- }
-
return s32RetStatus;
}
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index f4cc53f..81e75c9 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -484,11 +484,6 @@ static void CfgScanResult(tenuScanEvent enuScanEvent,
tstrNetworkInfo *pstrNetwo
up(&(priv->hSemScanReq));
}
}
-
-
- WILC_CATCH(s32Error)
- {
- }
}
--
2.1.0
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
