staging: wilc1000: fix return type of wilc_set_join_req

This patch changes return type of wilc_set_join_req from s32 to int.
The result variable gets return value from wilc_mq_send that has return
type of int. It should be changed return type of this function as well
as data type of result variable.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.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 78d58e092d20734344d7a2fde4453a630083a5b3..b24697baa1596707ebe426ee7b2080c20f6b646e 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3365,13 +3365,13 @@ int wilc_set_mac_address(struct wilc_vif *vif, u8 *mac_addr)
        return result;
 }
 
-s32 wilc_set_join_req(struct wilc_vif *vif, u8 *pu8bssid, const u8 *pu8ssid,
+int wilc_set_join_req(struct wilc_vif *vif, u8 *pu8bssid, const u8 *pu8ssid,
                      size_t ssidLen, const u8 *pu8IEs, size_t IEsLen,
                      wilc_connect_result pfConnectResult, void *pvUserArg,
                      u8 u8security, enum AUTHTYPE tenuAuth_type,
                      u8 u8channel, void *pJoinParams)
 {
-       s32 result = 0;
+       int result = 0;
        struct host_if_msg msg;
        struct host_if_drv *hif_drv = vif->hif_drv;
 

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index af8582456cd60dde216fcbf98dd2f5ec887b3095..eaf3a1002e796675d4a1f4f2ae2ca61f3c93a22b 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -326,7 +326,7 @@ int wilc_set_pmkid_info(struct wilc_vif *vif,
 int wilc_get_mac_address(struct wilc_vif *vif, u8 *mac_addr);
 int wilc_set_mac_address(struct wilc_vif *vif, u8 *mac_addr);
 int wilc_wait_msg_queue_idle(void);
-s32 wilc_set_join_req(struct wilc_vif *vif, u8 *pu8bssid, const u8 *pu8ssid,
+int wilc_set_join_req(struct wilc_vif *vif, u8 *pu8bssid, const u8 *pu8ssid,
                      size_t ssidLen, const u8 *pu8IEs, size_t IEsLen,
                      wilc_connect_result pfConnectResult, void *pvUserArg,
                      u8 u8security, enum AUTHTYPE tenuAuth_type,