summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChaehyun Lim <chaehyun.lim@gmail.com>2015-10-02 15:44:53 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-04 11:42:39 +0300
commit244efb1f5df5589c98bc1d0d1850c896151b9caa (patch)
treef9e224c6d4564022baad771c49634df4299b9878
parent5ba48ecca5bb528ee5893513f4e4b5f3c8a7c214 (diff)
downloadlinux-244efb1f5df5589c98bc1d0d1850c896151b9caa.tar.xz
staging: wilc1000: fix return type of host_int_wait_msg_queue_idle
This patch changes return type of host_int_wait_msg_queue_idle from s32 to int. s32Error gets return value from wilc_mq_send that has return type of int. It should be changed return type of host_int_wait_msg_queue_idle by int as well as data type of s32Error. Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/wilc1000/host_interface.c4
-rw-r--r--drivers/staging/wilc1000/host_interface.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 4f683c90a50e..2777229d95b5 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -5342,9 +5342,9 @@ int host_int_set_mac_chnl_num(tstrWILC_WFIDrv *wfi_drv, u8 channel)
}
-s32 host_int_wait_msg_queue_idle(void)
+int host_int_wait_msg_queue_idle(void)
{
- 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 edcaf5aa0b47..bc8acdebff89 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -648,7 +648,7 @@ s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress);
* @date 19 march 2014
* @version 1.0
*/
-s32 host_int_wait_msg_queue_idle(void);
+int host_int_wait_msg_queue_idle(void);
/**
* @brief sets a start scan request