aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChaehyun Lim <chaehyun.lim@gmail.com>2015-12-24 16:52:33 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-03 15:08:06 -0800
commit5350251a9bba780fe1a92aebb71ecd7c37fa2e2f (patch)
treed42b429b30c59d147284207a1ea584fc4cd58bb2
parentstaging: wilc1000: use kmemdup instead of kmalloc and memcpy (diff)
staging: wilc1000: fix return type of wilc_disconnect
This patch changes return type of wilc_disconnect from s32 to int. The result variable gets return value from wilc_disconnect 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>
-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 65189422432f..5ddf78df8a8a 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3461,9 +3461,9 @@ int wilc_flush_join_req(struct wilc_vif *vif)
return result;
}
-s32 wilc_disconnect(struct wilc_vif *vif, u16 u16ReasonCode)
+int wilc_disconnect(struct wilc_vif *vif, u16 u16ReasonCode)
{
- 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 698d1b6bc330..e8c556a0c4aa 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -332,7 +332,7 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,
u8 security, enum AUTHTYPE auth_type,
u8 channel, void *join_params);
int wilc_flush_join_req(struct wilc_vif *vif);
-s32 wilc_disconnect(struct wilc_vif *vif, u16 u16ReasonCode);
+int wilc_disconnect(struct wilc_vif *vif, u16 u16ReasonCode);
int wilc_set_mac_chnl_num(struct wilc_vif *vif, u8 channel);
s32 wilc_get_rssi(struct wilc_vif *vif, s8 *ps8Rssi);
s32 wilc_scan(struct wilc_vif *vif, u8 u8ScanSource, u8 u8ScanType,