Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4168da71 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: fix return type of wilc_hif_set_cfg 



This patch changes return type of wilc_hif_set_cfg 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: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e0990c15

drivers/staging/wilc1000/host_interface.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3558,10 +3558,10 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type, 
	return result;

	return result;

}

}





s32 wilc_hif_set_cfg(struct wilc_vif *vif,

int wilc_hif_set_cfg(struct wilc_vif *vif,

		     struct cfg_param_val *pstrCfgParamVal)

		     struct cfg_param_val *pstrCfgParamVal)

{

{

	s32 result = 0;

	int result = 0;

	struct host_if_msg msg;

	struct host_if_msg msg;

	struct host_if_drv *hif_drv = vif->hif_drv;

	struct host_if_drv *hif_drv = vif->hif_drv;

drivers/staging/wilc1000/host_interface.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -337,7 +337,7 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type, 
	      u8 *ch_freq_list, u8 ch_list_len, const u8 *ies,

	      u8 *ch_freq_list, u8 ch_list_len, const u8 *ies,

	      size_t ies_len, wilc_scan_result scan_result, void *user_arg,

	      size_t ies_len, wilc_scan_result scan_result, void *user_arg,

	      struct hidden_network *hidden_network);

	      struct hidden_network *hidden_network);

s32 wilc_hif_set_cfg(struct wilc_vif *vif,

int wilc_hif_set_cfg(struct wilc_vif *vif,

		     struct cfg_param_val *pstrCfgParamVal);

		     struct cfg_param_val *pstrCfgParamVal);

int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler);

int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler);

s32 wilc_deinit(struct wilc_vif *vif);

s32 wilc_deinit(struct wilc_vif *vif);