staging: wilc1000: rename ScanResult in wilc_scan

This patch renames ScanResult to scan_result to avoid camelcase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index a3c13cb12b2fc89a466574d6c6608e3242fa408b..e475c775061ed7470b87832618161f5f753d905c 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3674,15 +3674,15 @@ 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 ScanResult, void *pvUserArg,
+             size_t ies_len, wilc_scan_result scan_result, void *pvUserArg,
              struct hidden_network *pstrHiddenNetwork)
 {
        int result = 0;
        struct host_if_msg msg;
        struct host_if_drv *hif_drv = vif->hif_drv;
 
-       if (!hif_drv || !ScanResult) {
-               PRINT_ER("hif_drv or ScanResult = NULL\n");
+       if (!hif_drv || !scan_result) {
+               PRINT_ER("hif_drv or scan_result = NULL\n");
                return -EFAULT;
        }
 
@@ -3700,7 +3700,7 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
        msg.vif = vif;
        msg.body.scan_info.src = scan_source;
        msg.body.scan_info.type = scan_type;
-       msg.body.scan_info.result = ScanResult;
+       msg.body.scan_info.result = scan_result;
        msg.body.scan_info.arg = pvUserArg;
 
        msg.body.scan_info.ch_list_len = ch_list_len;

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index a782b9e54a6fff794b1e763d622efaa9f2ef1ae6..aaaa5f7b729ea23aebe678bf11a4ae962cdf6f95 100644 (file)
--- 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 ScanResult, void *pvUserArg,
+             size_t ies_len, wilc_scan_result scan_result, void *pvUserArg,
              struct hidden_network *pstrHiddenNetwork);
 s32 wilc_hif_set_cfg(struct wilc_vif *vif,
                     struct cfg_param_val *pstrCfgParamVal);