OSDN Git Service

staging: wilc1000: fix return type of wilc_remain_on_channel
authorChaehyun Lim <chaehyun.lim@gmail.com>
Sun, 3 Jan 2016 08:35:34 +0000 (17:35 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Feb 2016 23:11:00 +0000 (15:11 -0800)
This patch changes return type of wilc_remain_on_channel from s32 to
int. The result variable gets return value from wilc_mq_send that has
data 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>
drivers/staging/wilc1000/host_interface.c
drivers/staging/wilc1000/host_interface.h

index 39fa5a3..30b4f30 100644 (file)
@@ -4061,13 +4061,13 @@ void wilc_scan_complete_received(struct wilc *wilc, u8 *pu8Buffer,
        return;
 }
 
-s32 wilc_remain_on_channel(struct wilc_vif *vif, u32 u32SessionID,
+int wilc_remain_on_channel(struct wilc_vif *vif, u32 u32SessionID,
                           u32 u32duration, u16 chan,
                           wilc_remain_on_chan_expired RemainOnChanExpired,
                           wilc_remain_on_chan_ready RemainOnChanReady,
                           void *pvUserArg)
 {
-       s32 result = 0;
+       int result = 0;
        struct host_if_msg msg;
        struct host_if_drv *hif_drv = vif->hif_drv;
 
index a2f428f..e28f462 100644 (file)
@@ -356,7 +356,7 @@ int wilc_setup_multicast_filter(struct wilc_vif *vif, bool enabled,
                                u32 count);
 int wilc_setup_ipaddress(struct wilc_vif *vif, u8 *ip_addr, u8 idx);
 s32 wilc_del_all_rx_ba_session(struct wilc_vif *vif, char *pBSSID, char TID);
-s32 wilc_remain_on_channel(struct wilc_vif *vif, u32 u32SessionID,
+int wilc_remain_on_channel(struct wilc_vif *vif, u32 u32SessionID,
                           u32 u32duration, u16 chan,
                           wilc_remain_on_chan_expired RemainOnChanExpired,
                           wilc_remain_on_chan_ready RemainOnChanReady,