]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: wilc1000: add an argument for Handle_SetWfiDrvHandler
authorJohnny Kim <johnny.kim@atmel.com>
Thu, 20 Aug 2015 07:32:51 +0000 (16:32 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Sep 2015 01:24:30 +0000 (18:24 -0700)
Similar to functions of same layer, this patch add an argument for
Handle_SetWfiDrvHandler function. As a result, the redundant typecasting is
removed.

Signed-off-by: Johnny Kim <johnny.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/host_interface.c

index 83abe78dd3a4ae4b030ecbc2b7c9fccab2bf3e43..0506d6dbb8579f8c8e5dd0f3ac7564b89a8674fb 100644 (file)
@@ -637,12 +637,13 @@ static s32 Handle_SetChannel(tstrWILC_WFIDrv *drvHandler, tstrHostIFSetChan *pst
  *  @date
  *  @version   1.0
  */
-static s32 Handle_SetWfiDrvHandler(tstrHostIfSetDrvHandler *pstrHostIfSetDrvHandler)
+static s32 Handle_SetWfiDrvHandler(tstrWILC_WFIDrv *drvHandler,
+                                  tstrHostIfSetDrvHandler *pstrHostIfSetDrvHandler)
 {
 
        s32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
-       tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)((pstrHostIfSetDrvHandler->u32Address));
+       tstrWILC_WFIDrv *pstrWFIDrv = drvHandler;
 
 
        /*prepare configuration packet*/
@@ -656,7 +657,7 @@ static s32 Handle_SetWfiDrvHandler(tstrHostIfSetDrvHandler *pstrHostIfSetDrvHand
        s32Error = SendConfigPkt(SET_CFG, &strWID, 1, true, (u32)pstrWFIDrv);
 
 
-       if ((pstrHostIfSetDrvHandler->u32Address) == (u32)NULL)
+       if (pstrWFIDrv == NULL)
                up(&hSemDeinitDrvHandle);
 
 
@@ -4474,7 +4475,8 @@ static int hostIFthread(void *pvArg)
                        break;
 
                case HOST_IF_MSG_SET_WFIDRV_HANDLER:
-                       Handle_SetWfiDrvHandler(&strHostIFmsg.uniHostIFmsgBody.strHostIfSetDrvHandler);
+                       Handle_SetWfiDrvHandler(strHostIFmsg.drvHandler,
+                                               &strHostIFmsg.uniHostIFmsgBody.strHostIfSetDrvHandler);
                        break;
 
                case HOST_IF_MSG_SET_OPERATION_MODE:
@@ -5819,7 +5821,7 @@ s32 host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *u32address)
        memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
        strHostIFmsg.u16MsgId = HOST_IF_MSG_SET_WFIDRV_HANDLER;
        strHostIFmsg.uniHostIFmsgBody.strHostIfSetDrvHandler.u32Address = u32address;
-       /* strHostIFmsg.drvHandler=hWFIDrv; */
+       strHostIFmsg.drvHandler = u32address;
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
        if (s32Error)