staging: wilc1000: rename pvUserArg in wilc_scan
authorChaehyun Lim <chaehyun.lim@gmail.com>
Tue, 5 Jan 2016 14:06:53 +0000 (23:06 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Feb 2016 23:15:43 +0000 (15:15 -0800)
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>
drivers/staging/wilc1000/host_interface.c
drivers/staging/wilc1000/host_interface.h

index e475c77..56b58d3 100644 (file)
@@ -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);
index aaaa5f7..1923a30 100644 (file)
@@ -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);