summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChaehyun Lim <chaehyun.lim@gmail.com>2016-01-05 23:06:53 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-03 15:15:43 -0800
commit2c97f2d4ed34f77481836d4511fa9fbb072c258e (patch)
tree4c52cd223fef31b88fada605a4cba69ba4b20724
parentc8fb0bf931decb8a78a51e275609c4573b4f728d (diff)
staging: wilc1000: rename pvUserArg in wilc_scan
This patch renames pvUserArg to user_arg to avoid camelcase. 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 e475c775061e..56b58d3dd292 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3674,7 +3674,7 @@ int wilc_get_statistics(struct wilc_vif *vif, struct rf_info *stats)
int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
u8 *ch_freq_list, u8 ch_list_len, const u8 *ies,
- size_t ies_len, wilc_scan_result scan_result, void *pvUserArg,
+ size_t ies_len, wilc_scan_result scan_result, void *user_arg,
struct hidden_network *pstrHiddenNetwork)
{
int result = 0;
@@ -3701,7 +3701,7 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
msg.body.scan_info.src = scan_source;
msg.body.scan_info.type = scan_type;
msg.body.scan_info.result = scan_result;
- msg.body.scan_info.arg = pvUserArg;
+ msg.body.scan_info.arg = user_arg;
msg.body.scan_info.ch_list_len = ch_list_len;
msg.body.scan_info.ch_freq_list = kmalloc(ch_list_len, GFP_KERNEL);
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index aaaa5f7b729e..1923a3093751 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -337,7 +337,7 @@ int wilc_set_mac_chnl_num(struct wilc_vif *vif, u8 channel);
int wilc_get_rssi(struct wilc_vif *vif, s8 *rssi_level);
int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
u8 *ch_freq_list, u8 ch_list_len, const u8 *ies,
- size_t ies_len, wilc_scan_result scan_result, void *pvUserArg,
+ size_t ies_len, wilc_scan_result scan_result, void *user_arg,
struct hidden_network *pstrHiddenNetwork);
s32 wilc_hif_set_cfg(struct wilc_vif *vif,
struct cfg_param_val *pstrCfgParamVal);