From d491ef72be51177a41d247a73f4b06cf5d3b084f Mon Sep 17 00:00:00 2001 From: Chaehyun Lim Date: Mon, 5 Oct 2015 19:34:49 +0900 Subject: [PATCH] staging: wilc1000: fix return type of host_int_set_operation_mode This patch changes return type of host_int_set_operation_mode from s32 to int. s32Error gets return value from wilc_mq_send that has return type of int. It should be changed return type by int as well as data type of s32Error. Signed-off-by: Chaehyun Lim Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/host_interface.c | 4 ++-- drivers/staging/wilc1000/host_interface.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 8311d53f923b..605bb2b50ec9 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -5282,9 +5282,9 @@ int host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *address) return result; } -s32 host_int_set_operation_mode(tstrWILC_WFIDrv *hWFIDrv, u32 u32mode) +int host_int_set_operation_mode(tstrWILC_WFIDrv *hWFIDrv, u32 u32mode) { - s32 s32Error = 0; + int s32Error = 0; struct host_if_msg msg; diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 314cd4190262..fb135bdb5b01 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -1187,7 +1187,7 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe * @version 1.0 */ int host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *address); -s32 host_int_set_operation_mode(tstrWILC_WFIDrv *hWFIDrv, u32 u32mode); +int host_int_set_operation_mode(tstrWILC_WFIDrv *hWFIDrv, u32 u32mode); static s32 Handle_ScanDone(tstrWILC_WFIDrv *drvHandler, tenuScanEvent enuEvent); -- 2.30.2