In cases when WILC_ERRORREPORT is immidiately followed by WILC_CATCH, no
goto is actually performed and therefore WILC_ERRORREPORT may be replaced
with either printout or assignment of the error value, and WILC_CATCH may
be completely removed.

Signed-off-by: Mike Rapoport <mike.rapop...@gmail.com>
---
 drivers/staging/wilc1000/host_interface.c | 312 +++++-------------------------
 1 file changed, 52 insertions(+), 260 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c 
b/drivers/staging/wilc1000/host_interface.c
index d75b38d..cbd4b12 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -670,11 +670,7 @@ static s32 Handle_SetChannel(tstrWILC_WFIDrv *drvHandler, 
tstrHostIFSetChan *pst
                                 get_id_from_handler(pstrWFIDrv));
        if (s32Error) {
                PRINT_ER("Failed to set channel\n");
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
-       }
-       WILC_CATCH(s32Error)
-       {
-
+               s32Error = WILC_INVALID_STATE;
        }
 
        return s32Error;
@@ -714,11 +710,7 @@ static s32 Handle_SetWfiDrvHandler(tstrWILC_WFIDrv 
*drvHandler,
 
        if (s32Error) {
                PRINT_ER("Failed to set driver handler\n");
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
-       }
-       WILC_CATCH(s32Error)
-       {
-
+               s32Error = WILC_INVALID_STATE;
        }
 
        return s32Error;
@@ -760,11 +752,7 @@ static s32 Handle_SetOperationMode(tstrWILC_WFIDrv 
*drvHandler, tstrHostIfSetOpe
 
        if (s32Error) {
                PRINT_ER("Failed to set driver handler\n");
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
-       }
-       WILC_CATCH(s32Error)
-       {
-
+               s32Error = WILC_INVALID_STATE;
        }
 
        return s32Error;
@@ -808,16 +796,11 @@ s32 Handle_set_IPAddress(tstrWILC_WFIDrv *drvHandler, u8 
*pu8IPAddr, u8 idx)
 
        if (s32Error) {
                PRINT_D(HOSTINF_DBG, "Failed to set IP address\n");
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
+               s32Error = WILC_INVALID_STATE;
        } else {
                PRINT_INFO(HOSTINF_DBG, "IP address set\n");
        }
 
-       WILC_CATCH(s32Error)
-       {
-
-       }
-
        return s32Error;
 }
 
@@ -859,18 +842,13 @@ s32 Handle_get_IPAddress(tstrWILC_WFIDrv *drvHandler, u8 
*pu8IPAddr, u8 idx)
 
        if (s32Error != WILC_SUCCESS) {
                PRINT_ER("Failed to get IP address\n");
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
+               s32Error = WILC_INVALID_STATE;
        } else {
                PRINT_INFO(HOSTINF_DBG, "IP address retrieved:: u8IfIdx = 
%d\n", idx);
                PRINT_INFO(HOSTINF_DBG, "%pI4\n", gs8GetIP[idx]);
                PRINT_INFO(HOSTINF_DBG, "\n");
        }
 
-       WILC_CATCH(s32Error)
-       {
-
-       }
-
        return s32Error;
 }
 
@@ -910,13 +888,9 @@ static s32 Handle_SetMacAddress(tstrWILC_WFIDrv 
*drvHandler, tstrHostIfSetMacAdd
                                 get_id_from_handler(pstrWFIDrv));
        if (s32Error) {
                PRINT_ER("Failed to set mac address\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
+               s32Error = WILC_FAIL;
        }
 
-       WILC_CATCH(s32Error)
-       {
-
-       }
        kfree(mac_buf);
        return s32Error;
 }
@@ -949,12 +923,9 @@ static s32 Handle_GetMacAddress(tstrWILC_WFIDrv 
*drvHandler, tstrHostIfGetMacAdd
                                 get_id_from_handler(drvHandler));
        if (s32Error) {
                PRINT_ER("Failed to get mac address\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
+               s32Error = WILC_FAIL;
        }
-       WILC_CATCH(s32Error)
-       {
 
-       }
        up(&hWaitResponse);
 
        return s32Error;
@@ -1494,10 +1465,7 @@ static s32 Handle_ScanDone(tstrWILC_WFIDrv *drvHandler, 
tenuScanEvent enuEvent)
                                         get_id_from_handler(pstrWFIDrv));
                if (s32Error != WILC_SUCCESS) {
                        PRINT_ER("Failed to set abort running scan\n");
-                       WILC_ERRORREPORT(s32Error, WILC_FAIL);
-               }
-               WILC_CATCH(s32Error)
-               {
+                       s32Error = WILC_FAIL;
                }
        }
 
@@ -2145,12 +2113,7 @@ static s32 Handle_FlushConnect(tstrWILC_WFIDrv 
*drvHandler)
                                 
get_id_from_handler(gu8FlushedJoinReqDrvHandler));
        if (s32Error) {
                PRINT_ER("Handle_Flush_Connect()] failed to send config 
packet\n");
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
-       }
-
-       WILC_CATCH(s32Error)
-       {
-
+               s32Error = WILC_INVALID_STATE;
        }
 
        return s32Error;
@@ -3233,16 +3196,9 @@ static s32 Switch_Log_Terminal(tstrWILC_WFIDrv 
*drvHandler)
 
        if (s32Error) {
                PRINT_D(HOSTINF_DBG, "Failed to switch log terminal\n");
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
+               s32Error = WILC_INVALID_STATE;
        } else {
                PRINT_INFO(HOSTINF_DBG, "MAC address set ::\n");
-
-
-       }
-
-       WILC_CATCH(s32Error)
-       {
-
        }
 
        return s32Error;
@@ -3278,14 +3234,9 @@ static s32 Handle_GetChnl(tstrWILC_WFIDrv *drvHandler)
        /*get the value by searching the local copy*/
        if (s32Error) {
                PRINT_ER("Failed to get channel number\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
+               s32Error = WILC_FAIL;
        }
 
-
-       WILC_CATCH(s32Error)
-       {
-
-       }
        up(&(pstrWFIDrv->hSemGetCHNL));
 
        return s32Error;
@@ -3320,15 +3271,9 @@ static void Handle_GetRssi(tstrWILC_WFIDrv *drvHandler)
 
        s32Error = SendConfigPkt(GET_CFG, &strWID, 1, true,
                                 get_id_from_handler(pstrWFIDrv));
-       if (s32Error) {
+       if (s32Error)
                PRINT_ER("Failed to get RSSI value\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
-       }
 
-       WILC_CATCH(s32Error)
-       {
-
-       }
        up(&(pstrWFIDrv->hSemGetRSSI));
 
 
@@ -3352,15 +3297,9 @@ static void Handle_GetLinkspeed(tstrWILC_WFIDrv 
*drvHandler)
 
        s32Error = SendConfigPkt(GET_CFG, &strWID, 1, true,
                                 get_id_from_handler(pstrWFIDrv));
-       if (s32Error) {
+       if (s32Error)
                PRINT_ER("Failed to get LINKSPEED value\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
-       }
 
-       WILC_CATCH(s32Error)
-       {
-
-       }
        up(&(pstrWFIDrv->hSemGetLINKSPEED));
 
 
@@ -3549,14 +3488,9 @@ static void Handle_AddBeacon(tstrWILC_WFIDrv 
*drvHandler, tstrHostIFSetBeacon *p
        /*Sending Cfg*/
        s32Error = SendConfigPkt(SET_CFG, &strWID, 1, false,
                                 get_id_from_handler(pstrWFIDrv));
-       if (s32Error) {
+       if (s32Error)
                PRINT_ER("Failed to send add beacon config packet\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
-       }
 
-       WILC_CATCH(s32Error)
-       {
-       }
        kfree(strWID.ps8WidVal);
        kfree(pstrSetBeaconParam->pu8Head);
        kfree(pstrSetBeaconParam->pu8Tail);
@@ -3595,15 +3529,8 @@ static void Handle_DelBeacon(tstrWILC_WFIDrv 
*drvHandler, tstrHostIFDelBeacon *p
        /*Sending Cfg*/
        s32Error = SendConfigPkt(SET_CFG, &strWID, 1, false,
                                 get_id_from_handler(pstrWFIDrv));
-       if (s32Error) {
-
+       if (s32Error)
                PRINT_ER("Failed to send delete beacon config packet\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
-       }
-
-       WILC_CATCH(s32Error)
-       {
-       }
 }
 
 
@@ -3692,15 +3619,9 @@ static void Handle_AddStation(tstrWILC_WFIDrv 
*drvHandler, tstrWILC_AddStaParam
        /*Sending Cfg*/
        s32Error = SendConfigPkt(SET_CFG, &strWID, 1, false,
                                 get_id_from_handler(pstrWFIDrv));
-       if (s32Error != WILC_SUCCESS) {
-
+       if (s32Error != WILC_SUCCESS)
                PRINT_ER("Failed to send add station config packet\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
-       }
 
-       WILC_CATCH(s32Error)
-       {
-       }
        kfree(pstrStationParam->pu8Rates);
        kfree(strWID.ps8WidVal);
 }
@@ -3750,15 +3671,9 @@ static void Handle_DelAllSta(tstrWILC_WFIDrv 
*drvHandler, tstrHostIFDelAllSta *p
        /*Sending Cfg*/
        s32Error = SendConfigPkt(SET_CFG, &strWID, 1, true,
                                 get_id_from_handler(pstrWFIDrv));
-       if (s32Error) {
-
+       if (s32Error)
                PRINT_ER("Failed to send add station config packet\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
-       }
 
-       WILC_CATCH(s32Error)
-       {
-       }
        kfree(strWID.ps8WidVal);
 
        up(&hWaitResponse);
@@ -3798,15 +3713,9 @@ static void Handle_DelStation(tstrWILC_WFIDrv 
*drvHandler, tstrHostIFDelSta *pst
        /*Sending Cfg*/
        s32Error = SendConfigPkt(SET_CFG, &strWID, 1, false,
                                 get_id_from_handler(pstrWFIDrv));
-       if (s32Error) {
-
+       if (s32Error)
                PRINT_ER("Failed to send add station config packet\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
-       }
 
-       WILC_CATCH(s32Error)
-       {
-       }
        kfree(strWID.ps8WidVal);
 }
 
@@ -3842,15 +3751,9 @@ static void Handle_EditStation(tstrWILC_WFIDrv 
*drvHandler, tstrWILC_AddStaParam
        /*Sending Cfg*/
        s32Error = SendConfigPkt(SET_CFG, &strWID, 1, false,
                                 get_id_from_handler(pstrWFIDrv));
-       if (s32Error) {
-
+       if (s32Error)
                PRINT_ER("Failed to send edit station config packet\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
-       }
 
-       WILC_CATCH(s32Error)
-       {
-       }
        kfree(pstrStationParam->pu8Rates);
        kfree(strWID.ps8WidVal);
 }
@@ -3980,12 +3883,7 @@ static int Handle_RegisterFrame(tstrWILC_WFIDrv 
*drvHandler, tstrHostIfRegisterF
                                 get_id_from_handler(pstrWFIDrv));
        if (s32Error) {
                PRINT_ER("Failed to frame register config packet\n");
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
-       }
-
-
-       WILC_CATCH(s32Error)
-       {
+               s32Error = WILC_INVALID_STATE;
        }
 
        return s32Error;
@@ -4076,11 +3974,7 @@ static void ListenTimerCB(unsigned long arg)
        /* send the message */
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-
-       }
+               PRINT_ER("Failed to send timer callback message\n");
 }
 #endif
 
@@ -4116,15 +4010,8 @@ static void Handle_PowerManagement(tstrWILC_WFIDrv 
*drvHandler, tstrHostIfPowerM
        /*Sending Cfg*/
        s32Error = SendConfigPkt(SET_CFG, &strWID, 1, true,
                                 get_id_from_handler(pstrWFIDrv));
-       if (s32Error) {
+       if (s32Error)
                PRINT_ER("Failed to send power management config packet\n");
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
-       }
-
-       WILC_CATCH(s32Error)
-       {
-
-       }
 }
 
 /**
@@ -4168,14 +4055,9 @@ static void Handle_SetMulticastFilter(tstrWILC_WFIDrv 
*drvHandler, tstrHostIFSet
        /*Sending Cfg*/
        s32Error = SendConfigPkt(SET_CFG, &strWID, 1, false,
                                 get_id_from_handler(drvHandler));
-       if (s32Error) {
+       if (s32Error)
                PRINT_ER("Failed to send setup multicast config packet\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
-       }
 
-       WILC_CATCH(s32Error)
-       {
-       }
        kfree(strWID.ps8WidVal);
 
 }
@@ -5287,14 +5169,8 @@ s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 
*pu8MacAddress)
        strHostIFmsg.drvHandler = hWFIDrv;
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
-       if (s32Error) {
+       if (s32Error)
                PRINT_ER("Failed to send message queue: Set mac address\n");
-               WILC_ERRORREPORT(s32Error, s32Error);
-       }
-       WILC_CATCH(s32Error)
-       {
-
-       }
 
        return s32Error;
 
@@ -5385,12 +5261,7 @@ s32 host_int_get_site_survey_results(tstrWILC_WFIDrv 
*hWFIDrv,
        /*get the value by searching the local copy*/
        if (s32Error) {
                PRINT_ER("Failed to send config packet to get survey 
results\n");
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
-       }
-
-       WILC_CATCH(s32Error)
-       {
-
+               s32Error = WILC_INVALID_STATE;
        }
 
        return s32Error;
@@ -5584,15 +5455,9 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)
 
        /* send the message */
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
-       if (s32Error) {
+       if (s32Error)
                PRINT_ER("Failed to send message queue: Flush join request\n");
-               WILC_ERRORREPORT(s32Error, WILC_FAIL);
-       }
-
-       WILC_CATCH(s32Error)
-       {
 
-       }
        return s32Error;
 }
 
@@ -5742,15 +5607,11 @@ s32 host_int_get_assoc_res_info(tstrWILC_WFIDrv 
*hWFIDrv, u8 *pu8AssocRespInfo,
        if (s32Error) {
                PRINT_ER("Failed to send association response config packet\n");
                *pu32RcvdAssocRespInfoLen = 0;
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
+               s32Error = WILC_INVALID_STATE;
        } else {
                *pu32RcvdAssocRespInfoLen = strWID.s32ValueSize;
        }
 
-       WILC_CATCH(s32Error)
-       {
-
-       }
        return s32Error;
 }
 
@@ -5817,11 +5678,7 @@ s32 host_int_set_mac_chnl_num(tstrWILC_WFIDrv *hWFIDrv, 
u8 u8ChNum)
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-
-       }
+               PRINT_ER("Failed to send set channel message\n");
 
        return s32Error;
 }
@@ -5839,11 +5696,7 @@ s32 host_int_wait_msg_queue_idle(void)
        strHostIFmsg.u16MsgId = HOST_IF_MSG_Q_IDLE;
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-
-       }
+               PRINT_ER("Failed to send message queue\n");
 
        /* wait untill MSG Q is empty */
        down(&hWaitResponse);
@@ -5868,11 +5721,7 @@ s32 host_int_set_wfi_drv_handler(tstrWILC_WFIDrv 
*u32address)
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-
-       }
+               PRINT_ER("Failed to send message queue\n");
 
        return s32Error;
 }
@@ -5895,11 +5744,7 @@ s32 host_int_set_operation_mode(tstrWILC_WFIDrv 
*hWFIDrv, u32 u32mode)
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-
-       }
+               PRINT_ER("Failed to send message queue\n");
 
        return s32Error;
 }
@@ -5984,16 +5829,12 @@ s32 host_int_test_set_int_wid(tstrWILC_WFIDrv *hWFIDrv, 
u32 u32TestMemAddr)
                                 get_id_from_handler(pstrWFIDrv));
        if (s32Error) {
                PRINT_ER("Test Function: Failed to set wid value\n");
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
+               s32Error = WILC_INVALID_STATE;
        } else {
                PRINT_D(HOSTINF_DBG, "Successfully set wid value\n");
 
        }
 
-       WILC_CATCH(s32Error)
-       {
-
-       }
        return s32Error;
 }
 
@@ -6074,16 +5915,12 @@ s32 host_int_test_get_int_wid(tstrWILC_WFIDrv *hWFIDrv, 
u32 *pu32TestMemAddr)
        /*get the value by searching the local copy*/
        if (s32Error) {
                PRINT_ER("Test Function: Failed to get wid value\n");
-               WILC_ERRORREPORT(s32Error, WILC_INVALID_STATE);
+               s32Error = WILC_INVALID_STATE;
        } else {
                PRINT_D(HOSTINF_DBG, "Successfully got wid value\n");
 
        }
 
-       WILC_CATCH(s32Error)
-       {
-
-       }
        return s32Error;
 }
 
@@ -6981,11 +6818,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, 
u32 u32SessionID, u32 u
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-
-       }
+               PRINT_ER("Failed to send remain on channel message\n");
 
        return s32Error;
 }
@@ -7024,11 +6857,8 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv 
*hWFIDrv, u32 u32SessionID)
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
+               PRINT_ER("Failed to send timer fired message\n");
 
-       }
        return s32Error;
 }
 
@@ -7074,11 +6904,7 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, 
u16 u16FrameType, bool bRe
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-
-       }
+               PRINT_ER("Failed to send register frame message\n");
 
        return s32Error;
 
@@ -7231,11 +7057,9 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, 
tstrWILC_AddStaParam *pstrSta
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
+               PRINT_ER("Failed to send add station message\n");
 
-       WILC_CATCH(s32Error)
-       {
-       }
+ERRORHANDLER:
        return s32Error;
 }
 
@@ -7276,11 +7100,8 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const 
u8 *pu8MacAddr)
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
+               PRINT_ER("Failed to send delete station message\n");
 
-       WILC_CATCH(s32Error)
-       {
-       }
        return s32Error;
 }
 /**
@@ -7333,12 +7154,8 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 
pu8MacAddr[][ETH_ALEN])
 
 
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
+               PRINT_ER("Failed to send delete all stations message\n");
 
-       WILC_CATCH(s32Error)
-       {
-
-       }
        down(&hWaitResponse);
 
        return s32Error;
@@ -7384,10 +7201,9 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, 
tstrWILC_AddStaParam *pstrSt
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-       }
+               PRINT_ER("Failed to send edit station message\n");
+
+ERRORHANDLER:
        return s32Error;
 }
 #endif /*WILC_AP_EXTERNAL_MLME*/
@@ -7420,10 +7236,8 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, 
bool bIsEnabled, u32 u32Ti
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-       }
+               PRINT_ER("Failed to send power management message\n");
+
        return s32Error;
 }
 
@@ -7453,10 +7267,8 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv 
*hWFIDrv, bool bIsEnabled, u
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-       }
+               PRINT_ER("Failed to send set multicast filter message\n");
+
        return s32Error;
 }
 
@@ -7721,11 +7533,7 @@ static int host_int_addBASession(tstrWILC_WFIDrv 
*hWFIDrv, char *pBSSID, char TI
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-
-       }
+               PRINT_ER("Failed to send add BA session message\n");
 
        return s32Error;
 }
@@ -7752,11 +7560,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char 
*pBSSID, char TID)
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-
-       }
+               PRINT_ER("Failed to send delete BA session message\n");
 
        /*BugID_5222*/
        down(&hWaitResponse);
@@ -7785,11 +7589,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv 
*hWFIDrv, char *pBSSID, char T
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-
-       }
+               PRINT_ER("Failed to send delete all RX BA sessions message\n");
 
        /*BugID_5222*/
        down(&hWaitResponse);
@@ -7828,11 +7628,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, 
u8 *u16ipadd, u8 idx)
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-
-       }
+               PRINT_ER("Failed to send set IP address message\n");
 
        return s32Error;
 
@@ -7867,11 +7663,7 @@ s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 
*u16ipadd, u8 idx)
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, 
sizeof(tstrHostIFmsg));
        if (s32Error)
-               WILC_ERRORREPORT(s32Error, s32Error);
-       WILC_CATCH(s32Error)
-       {
-
-       }
+               PRINT_ER("Failed to send get IP address message\n");
 
        return s32Error;
 
-- 
2.1.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to