staging: wilc1000: remove tstrWILC_TimerAttrs typedef

It was not used for anything, so remove it, and the variables in
wilc_timer.c that were being passed of its type.

Cc: Johnny Kim <johnny.kim@atmel.com>
Cc: Rachel Kim <rachel.kim@atmel.com>
Cc: Dean Lee <dean.lee@atmel.com>
Cc: Chris Park <chris.park@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 8086b8b24fb8b767e945368a0f231db845a6eee5..1184327228ad7086138ef3e7d0c0491273e9a95a 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1366,7 +1366,7 @@ static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler, tstrHostIFscanAttr *pstrHost
 
        WILC_CATCH(s32Error)
        {
-               WILC_TimerStop(&(pstrWFIDrv->hScanTimer), NULL);
+               WILC_TimerStop(&pstrWFIDrv->hScanTimer);
                /*if there is an ongoing scan request*/
                Handle_ScanDone(drvHandler, SCAN_EVENT_ABORTED);
        }
@@ -1966,7 +1966,7 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps
        {
                tstrConnectInfo strConnectInfo;
 
-               WILC_TimerStop(&(pstrWFIDrv->hConnectTimer), NULL);
+               WILC_TimerStop(&pstrWFIDrv->hConnectTimer);
 
                PRINT_D(HOSTINF_DBG, "could not start connecting to the required network\n");
 
@@ -2477,7 +2477,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, tstrRcvdGnrlAsy
                        }
 
 
-                       WILC_TimerStop(&(pstrWFIDrv->hConnectTimer), NULL);
+                       WILC_TimerStop(&pstrWFIDrv->hConnectTimer);
                        pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult(CONN_DISCONN_EVENT_CONN_RESP,
                                                                           &strConnectInfo,
                                                                           u8MacStatus,
@@ -2501,7 +2501,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, tstrRcvdGnrlAsy
                                #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
                                PRINT_D(GENERIC_DBG, "Obtaining an IP, Disable Scan\n");
                                g_obtainingIP = true;
-                               WILC_TimerStart(&hDuringIpTimer, 10000, NULL, NULL);
+                               WILC_TimerStart(&hDuringIpTimer, 10000, NULL);
                                #endif
 
                                #ifdef WILC_PARSE_SCAN_IN_HOST
@@ -2556,7 +2556,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, tstrRcvdGnrlAsy
 
                        if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) {
                                PRINT_D(HOSTINF_DBG, "\n\n<< Abort the running OBSS Scan >>\n\n");
-                               WILC_TimerStop(&(pstrWFIDrv->hScanTimer), NULL);
+                               WILC_TimerStop(&pstrWFIDrv->hScanTimer);
                                Handle_ScanDone((void *)pstrWFIDrv, SCAN_EVENT_ABORTED);
                        }
 
@@ -2633,7 +2633,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, tstrRcvdGnrlAsy
                        PRINT_D(HOSTINF_DBG, "Received MAC_DISCONNECTED from the FW while scanning\n");
                        PRINT_D(HOSTINF_DBG, "\n\n<< Abort the running Scan >>\n\n");
                        /*Abort the running scan*/
-                       WILC_TimerStop(&(pstrWFIDrv->hScanTimer), NULL);
+                       WILC_TimerStop(&pstrWFIDrv->hScanTimer);
                        if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult)
                                Handle_ScanDone(pstrWFIDrv, SCAN_EVENT_ABORTED);
 
@@ -3067,7 +3067,7 @@ static void Handle_Disconnect(tstrWILC_WFIDrv *drvHandler)
                strDisconnectNotifInfo.ie_len = 0;
 
                if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) {
-                       WILC_TimerStop(&(pstrWFIDrv->hScanTimer), NULL);
+                       WILC_TimerStop(&pstrWFIDrv->hScanTimer);
                        pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult(SCAN_EVENT_ABORTED, NULL,
                                                                        pstrWFIDrv->strWILC_UsrScanReq.u32UserScanPvoid, NULL);
 
@@ -3080,7 +3080,7 @@ static void Handle_Disconnect(tstrWILC_WFIDrv *drvHandler)
                        /*Stop connect timer, if connection in progress*/
                        if (pstrWFIDrv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) {
                                PRINT_D(HOSTINF_DBG, "Upper layer requested termination of connection\n");
-                               WILC_TimerStop(&(pstrWFIDrv->hConnectTimer), NULL);
+                               WILC_TimerStop(&pstrWFIDrv->hConnectTimer);
                        }
 
                        pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult(CONN_DISCONN_EVENT_DISCONN_NOTIF, NULL,
@@ -3849,7 +3849,7 @@ static int Handle_RemainOnChan(tstrWILC_WFIDrv *drvHandler, tstrHostIfRemainOnCh
        WILC_CATCH(-1)
        {
                P2P_LISTEN_STATE = 1;
-               WILC_TimerStart(&(pstrWFIDrv->hRemainOnChannel), pstrHostIfRemainOnChan->u32duration, (void *)pstrWFIDrv, NULL);
+               WILC_TimerStart(&(pstrWFIDrv->hRemainOnChannel), pstrHostIfRemainOnChan->u32duration, (void *)pstrWFIDrv);
 
                /*Calling CFG ready_on_channel*/
                if (pstrWFIDrv->strHostIfRemainOnChan.pRemainOnChanReady)
@@ -3984,7 +3984,7 @@ static void ListenTimerCB(void *pvArg)
        tstrHostIFmsg strHostIFmsg;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)pvArg;
        /*Stopping remain-on-channel timer*/
-       WILC_TimerStop(&(pstrWFIDrv->hRemainOnChannel), NULL);
+       WILC_TimerStop(&pstrWFIDrv->hRemainOnChannel);
 
        /* prepare the Timer Callback message */
        memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
@@ -4395,7 +4395,7 @@ static int hostIFthread(void *pvArg)
                        break;
 
                case HOST_IF_MSG_RCVD_SCAN_COMPLETE:
-                       WILC_TimerStop(&(pstrWFIDrv->hScanTimer), NULL);
+                       WILC_TimerStop(&pstrWFIDrv->hScanTimer);
                        PRINT_D(HOSTINF_DBG, "scan completed successfully\n");
 
                        /*BugID_5213*/
@@ -5485,7 +5485,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,
        }
 
        enuScanConnTimer = CONNECT_TIMER;
-       WILC_TimerStart(&(pstrWFIDrv->hConnectTimer), HOST_IF_CONNECT_TIMEOUT, (void *) hWFIDrv, NULL);
+       WILC_TimerStart(&(pstrWFIDrv->hConnectTimer), HOST_IF_CONNECT_TIMEOUT, (void *) hWFIDrv);
 
        WILC_CATCH(s32Error)
        {
@@ -6218,7 +6218,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
 
        enuScanConnTimer = SCAN_TIMER;
        PRINT_D(HOSTINF_DBG, ">> Starting the SCAN timer\n");
-       WILC_TimerStart(&(pstrWFIDrv->hScanTimer), HOST_IF_SCAN_TIMEOUT, (void *) hWFIDrv, NULL);
+       WILC_TimerStart(&(pstrWFIDrv->hScanTimer), HOST_IF_SCAN_TIMEOUT, (void *) hWFIDrv);
 
 
        WILC_CATCH(s32Error)
@@ -6441,7 +6441,7 @@ void GetPeriodicRSSI(void *pvArg)
                        return;
                }
        }
-       WILC_TimerStart(&(g_hPeriodicRSSI), 5000, (void *)pstrWFIDrv, NULL);
+       WILC_TimerStart(&(g_hPeriodicRSSI), 5000, (void *)pstrWFIDrv);
 }
 
 
@@ -6537,23 +6537,23 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
                        s32Error = WILC_FAIL;
                        goto _fail_mq_;
                }
-               s32Error = WILC_TimerCreate(&(g_hPeriodicRSSI), GetPeriodicRSSI, NULL);
+               s32Error = WILC_TimerCreate(&(g_hPeriodicRSSI), GetPeriodicRSSI);
                if (s32Error < 0) {
                        PRINT_ER("Failed to creat Timer\n");
                        goto _fail_timer_1;
                }
-               WILC_TimerStart(&(g_hPeriodicRSSI), 5000, (void *)pstrWFIDrv, NULL);
+               WILC_TimerStart(&(g_hPeriodicRSSI), 5000, (void *)pstrWFIDrv);
 
        }
 
 
-       s32Error = WILC_TimerCreate(&(pstrWFIDrv->hScanTimer), TimerCB_Scan, NULL);
+       s32Error = WILC_TimerCreate(&(pstrWFIDrv->hScanTimer), TimerCB_Scan);
        if (s32Error < 0) {
                PRINT_ER("Failed to creat Timer\n");
                goto _fail_thread_;
        }
 
-       s32Error = WILC_TimerCreate(&(pstrWFIDrv->hConnectTimer), TimerCB_Connect, NULL);
+       s32Error = WILC_TimerCreate(&(pstrWFIDrv->hConnectTimer), TimerCB_Connect);
        if (s32Error < 0) {
                PRINT_ER("Failed to creat Timer\n");
                goto _fail_timer_1;
@@ -6562,7 +6562,7 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
 
        #ifdef WILC_P2P
        /*Remain on channel timer*/
-       s32Error = WILC_TimerCreate(&(pstrWFIDrv->hRemainOnChannel), ListenTimerCB, NULL);
+       s32Error = WILC_TimerCreate(&(pstrWFIDrv->hRemainOnChannel), ListenTimerCB);
        if (s32Error < 0) {
                PRINT_ER("Failed to creat Remain-on-channel Timer\n");
                goto _fail_timer_3;
@@ -6618,13 +6618,13 @@ _fail_mem_:
                kfree(pstrWFIDrv);
 #ifdef WILC_P2P
 _fail_timer_3:
-       WILC_TimerDestroy(&(pstrWFIDrv->hRemainOnChannel), NULL);
+       WILC_TimerDestroy(&pstrWFIDrv->hRemainOnChannel);
 #endif
 _fail_timer_2:
        up(&(pstrWFIDrv->gtOsCfgValuesSem));
-       WILC_TimerDestroy(&(pstrWFIDrv->hConnectTimer), NULL);
+       WILC_TimerDestroy(&pstrWFIDrv->hConnectTimer);
 _fail_timer_1:
-       WILC_TimerDestroy(&(pstrWFIDrv->hScanTimer), NULL);
+       WILC_TimerDestroy(&pstrWFIDrv->hScanTimer);
 _fail_thread_:
        kthread_stop(HostIFthreadHandler);
 _fail_mq_:
@@ -6673,25 +6673,25 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
        /*BugID_5348*/
        /*Destroy all timers before acquiring hSemDeinitDrvHandle*/
        /*to guarantee handling all messages befor proceeding*/
-       if (WILC_TimerDestroy(&(pstrWFIDrv->hScanTimer), NULL)) {
+       if (WILC_TimerDestroy(&pstrWFIDrv->hScanTimer)) {
                PRINT_D(HOSTINF_DBG, ">> Scan timer is active\n");
                /* msleep(HOST_IF_SCAN_TIMEOUT+1000); */
        }
 
-       if (WILC_TimerDestroy(&(pstrWFIDrv->hConnectTimer), NULL)) {
+       if (WILC_TimerDestroy(&pstrWFIDrv->hConnectTimer)) {
                PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n");
                /* msleep(HOST_IF_CONNECT_TIMEOUT+1000); */
        }
 
 
-       if (WILC_TimerDestroy(&(g_hPeriodicRSSI), NULL)) {
+       if (WILC_TimerDestroy(&g_hPeriodicRSSI)) {
                PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n");
                /* msleep(HOST_IF_CONNECT_TIMEOUT+1000); */
        }
 
        #ifdef WILC_P2P
        /*Destroy Remain-onchannel Timer*/
-       WILC_TimerDestroy(&(pstrWFIDrv->hRemainOnChannel), NULL);
+       WILC_TimerDestroy(&pstrWFIDrv->hRemainOnChannel);
        #endif
 
        host_int_set_wfi_drv_handler(NULL);
@@ -6715,7 +6715,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
        memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
 
        if (clients_count == 1) {
-               if (WILC_TimerDestroy(&g_hPeriodicRSSI, NULL)) {
+               if (WILC_TimerDestroy(&g_hPeriodicRSSI)) {
                        PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n");
                        /* msleep(HOST_IF_CONNECT_TIMEOUT+1000); */
                }
@@ -6991,7 +6991,7 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID)
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
 
        /*Stopping remain-on-channel timer*/
-       WILC_TimerStop(&(pstrWFIDrv->hRemainOnChannel), NULL);
+       WILC_TimerStop(&pstrWFIDrv->hRemainOnChannel);
 
        /* prepare the timer fire Message */
        memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 5b6f698445face0ba8f54e3ee892bcd5fbfb2675..22053e57aa15a9db2731f1512b981fc15978cae3 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -286,7 +286,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
                if (nic->iftype == STATION_MODE || nic->iftype == CLIENT_MODE) {
                        pstrWFIDrv->IFC_UP = 1;
                        g_obtainingIP = false;
-                       WILC_TimerStop(&hDuringIpTimer, NULL);
+                       WILC_TimerStop(&hDuringIpTimer);
                        PRINT_D(GENERIC_DBG, "IP obtained , enable scan\n");
                }
 

diff --git a/drivers/staging/wilc1000/wilc_timer.c b/drivers/staging/wilc1000/wilc_timer.c
index 995f9c841f670dac29be42df20206858de5d65fd..5b2a527f1d94f1fb747c62a0a4ab13d0d0093a5f 100644 (file)
--- a/drivers/staging/wilc1000/wilc_timer.c
+++ b/drivers/staging/wilc1000/wilc_timer.c
@@ -2,7 +2,7 @@
 #include "wilc_timer.h"
 
 WILC_ErrNo WILC_TimerCreate(struct timer_list *pHandle,
-       tpfWILC_TimerFunction pfCallback, tstrWILC_TimerAttrs *pstrAttrs)
+       tpfWILC_TimerFunction pfCallback)
 {
        WILC_ErrNo s32RetStatus = WILC_SUCCESS;
        setup_timer(pHandle, (void(*)(unsigned long))pfCallback, 0);
@@ -10,8 +10,7 @@ WILC_ErrNo WILC_TimerCreate(struct timer_list *pHandle,
        return s32RetStatus;
 }
 
-WILC_ErrNo WILC_TimerDestroy(struct timer_list *pHandle,
-       tstrWILC_TimerAttrs *pstrAttrs)
+WILC_ErrNo WILC_TimerDestroy(struct timer_list *pHandle)
 {
        WILC_ErrNo s32RetStatus = WILC_FAIL;
        if (pHandle != NULL) {
@@ -24,7 +23,7 @@ WILC_ErrNo WILC_TimerDestroy(struct timer_list *pHandle,
 
 
 WILC_ErrNo WILC_TimerStart(struct timer_list *pHandle, u32 u32Timeout,
-       void *pvArg, tstrWILC_TimerAttrs *pstrAttrs)
+       void *pvArg)
 {
        WILC_ErrNo s32RetStatus = WILC_FAIL;
        if (pHandle != NULL) {
@@ -34,8 +33,7 @@ WILC_ErrNo WILC_TimerStart(struct timer_list *pHandle, u32 u32Timeout,
        return s32RetStatus;
 }
 
-WILC_ErrNo WILC_TimerStop(struct timer_list *pHandle,
-       tstrWILC_TimerAttrs *pstrAttrs)
+WILC_ErrNo WILC_TimerStop(struct timer_list *pHandle)
 {
        WILC_ErrNo s32RetStatus = WILC_FAIL;
        if (pHandle != NULL)

diff --git a/drivers/staging/wilc1000/wilc_timer.h b/drivers/staging/wilc1000/wilc_timer.h
index c56ab9b62cc1dbeaa35f8211e71c1f9b4c5b30be..529f299880a75abaab59042090c4aa5485ed136a 100644 (file)
--- a/drivers/staging/wilc1000/wilc_timer.h
+++ b/drivers/staging/wilc1000/wilc_timer.h
@@ -15,18 +15,6 @@
 
 typedef void (*tpfWILC_TimerFunction)(void *);
 
-/*!
- *  @struct             tstrWILC_TimerAttrs
- *  @brief             Timer API options
- *  @author            syounan
- *  @date              16 Aug 2010
- *  @version           1.0
- */
-typedef struct {
-       /* a dummy member to avoid compiler errors*/
-       u8 dummy;
-} tstrWILC_TimerAttrs;
-
 /*!
  *  @brief     Creates a new timer
  *  @details   Timers are a useful utility to execute some callback function
@@ -51,7 +39,6 @@ typedef struct {
  *              and only flags other threads to do the actual work
  *              also it should be noted that the underlaying OS maynot give any
  *              guarentees on which contect this callback will execute in
- *  @param[in] pstrAttrs Optional attributes, NULL for default
  *  @return    Error code indicating sucess/failure
  *  @sa                WILC_TimerAttrs
  *  @author    syounan
@@ -59,7 +46,7 @@ typedef struct {
  *  @version   1.0
  */
 WILC_ErrNo WILC_TimerCreate(struct timer_list *pHandle,
-                           tpfWILC_TimerFunction pfCallback, tstrWILC_TimerAttrs *pstrAttrs);
+                           tpfWILC_TimerFunction pfCallback);
 
 
 /*!
@@ -70,15 +57,13 @@ WILC_ErrNo WILC_TimerCreate(struct timer_list *pHandle,
  *              if the timer was EXECUTING then the callback will be allowed to
  *              finish first then all resources are freed
  *  @param[in] pHandle handle to the timer object
- *  @param[in] pstrAttrs Optional attributes, NULL for default
  *  @return    Error code indicating sucess/failure
  *  @sa                WILC_TimerAttrs
  *  @author    syounan
  *  @date      16 Aug 2010
  *  @version   1.0
  */
-WILC_ErrNo WILC_TimerDestroy(struct timer_list *pHandle,
-                            tstrWILC_TimerAttrs *pstrAttrs);
+WILC_ErrNo WILC_TimerDestroy(struct timer_list *pHandle);
 
 /*!
  *  @brief     Starts a given timer
@@ -91,16 +76,13 @@ WILC_ErrNo WILC_TimerDestroy(struct timer_list *pHandle,
  *  @param[in] u32Timeout timeout value in msec after witch the callback
  *              function will be executed. Timeout value of 0 is not allowed for
  *              periodic timers
- *  @param[in] pstrAttrs Optional attributes, NULL for default,
- *              set bPeriodicTimer to run this timer as a periodic timer
  *  @return    Error code indicating sucess/failure
  *  @sa                WILC_TimerAttrs
  *  @author    syounan
  *  @date      16 Aug 2010
  *  @version   1.0
  */
-WILC_ErrNo WILC_TimerStart(struct timer_list *pHandle, u32 u32Timeout, void *pvArg,
-                          tstrWILC_TimerAttrs *pstrAttrs);
+WILC_ErrNo WILC_TimerStart(struct timer_list *pHandle, u32 u32Timeout, void *pvArg);
 
 
 /*!
@@ -114,15 +96,13 @@ WILC_ErrNo WILC_TimerStart(struct timer_list *pHandle, u32 u32Timeout, void *pvA
  *              done then move the timer to the IDLE state (which is trivial
  *              work if the timer is non periodic)
  *  @param[in] pHandle handle to the timer object
- *  @param[in] pstrAttrs Optional attributes, NULL for default,
  *  @return    Error code indicating sucess/failure
  *  @sa                WILC_TimerAttrs
  *  @author    syounan
  *  @date      16 Aug 2010
  *  @version   1.0
  */
-WILC_ErrNo WILC_TimerStop(struct timer_list *pHandle,
-                         tstrWILC_TimerAttrs *pstrAttrs);
+WILC_ErrNo WILC_TimerStop(struct timer_list *pHandle);
 
 
 

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 138d188adf56ea75ec9c4fcff0c92db13b056b8b..a505677d47d8637b29d4f526d85425c214702421 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -145,7 +145,7 @@ void clear_shadow_scan(void *pUserVoid)
 {
        int i;
        if (op_ifcs == 0) {
-               WILC_TimerDestroy(&hAgingTimer, NULL);
+               WILC_TimerDestroy(&hAgingTimer);
                PRINT_INFO(CORECONFIG_DBG, "destroy aging timer\n");
 
                for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {
@@ -257,7 +257,7 @@ void remove_network_from_shadow(void *pUserVoid)
 
        PRINT_D(CFG80211_DBG, "Number of cached networks: %d\n", u32LastScannedNtwrksCountShadow);
        if (u32LastScannedNtwrksCountShadow != 0)
-               WILC_TimerStart(&(hAgingTimer), AGING_TIME, pUserVoid, NULL);
+               WILC_TimerStart(&(hAgingTimer), AGING_TIME, pUserVoid);
        else
                PRINT_D(CFG80211_DBG, "No need to restart Aging timer\n");
 }
@@ -277,7 +277,7 @@ int8_t is_network_in_shadow(tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid)
 
        if (u32LastScannedNtwrksCountShadow == 0) {
                PRINT_D(CFG80211_DBG, "Starting Aging timer\n");
-               WILC_TimerStart(&(hAgingTimer), AGING_TIME, pUserVoid, NULL);
+               WILC_TimerStart(&(hAgingTimer), AGING_TIME, pUserVoid);
                state = -1;
        } else {
                /* Linear search for now */
@@ -2843,7 +2843,7 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev
 
        #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
        g_obtainingIP = false;
-       WILC_TimerStop(&hDuringIpTimer, NULL);
+       WILC_TimerStop(&hDuringIpTimer);
        PRINT_D(GENERIC_DBG, "Changing virtual interface, enable scan\n");
        #endif
        /*BugID_5137*/
@@ -3069,7 +3069,7 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev
 
                #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
                g_obtainingIP = true;
-               WILC_TimerStart(&hDuringIpTimer, duringIP_TIME, NULL, NULL);
+               WILC_TimerStart(&hDuringIpTimer, duringIP_TIME, NULL);
                #endif
                host_int_set_power_mgmt(priv->hWILCWFIDrv, 0, 0);
                /*BugID_5222*/
@@ -3824,9 +3824,9 @@ int WILC_WFI_InitHostInt(struct net_device *net)
        PRINT_D(INIT_DBG, "Host[%p][%p]\n", net, net->ieee80211_ptr);
        priv = wdev_priv(net->ieee80211_ptr);
        if (op_ifcs == 0) {
-               s32Error = WILC_TimerCreate(&(hAgingTimer), remove_network_from_shadow, NULL);
+               s32Error = WILC_TimerCreate(&(hAgingTimer), remove_network_from_shadow);
                #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
-               s32Error = WILC_TimerCreate(&(hDuringIpTimer), clear_duringIP, NULL);
+               s32Error = WILC_TimerCreate(&(hDuringIpTimer), clear_duringIP);
                #endif
        }
        op_ifcs++;
@@ -3876,7 +3876,7 @@ int WILC_WFI_DeInitHostInt(struct net_device *net)
        #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
        if (op_ifcs == 0) {
                PRINT_D(CORECONFIG_DBG, "destroy during ip\n");
-               WILC_TimerDestroy(&hDuringIpTimer, NULL);
+               WILC_TimerDestroy(&hDuringIpTimer);
        }
        #endif