staging: wilc1000: Rename tstrRSSI members and change type of u8Full to bool

Remove Hungarian notation and camel casing from all tstrRSSI members'
names. Additionally, change type of u8Full to bool since it only takes
values 1 or 0.

Signed-off-by: Tahia Khan <tahia.khan@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 1c77529fb1b128108176c673dac2988508054bfe..9712d89af05539c1b45135ba78a4fb039217b5a6 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -71,9 +71,9 @@ enum connect_status {
 };
 
 struct rssi_history_buffer {
-       u8 u8Full;
-       u8 u8Index;
-       s8 as8RSSI[NUM_RSSI];
+       bool full;
+       u8 index;
+       s8 samples[NUM_RSSI];
 };
 
 struct network_info {

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 7961d1c56847392c6d977e065cab76f435ea31de..4f640e51740809c81d1d7be01305e4ea483c36c0 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -205,11 +205,11 @@ static u32 get_rssi_avg(struct network_info *network_info)
 {
        u8 i;
        int rssi_v = 0;
-       u8 num_rssi = (network_info->str_rssi.u8Full) ?
-                      NUM_RSSI : (network_info->str_rssi.u8Index);
+       u8 num_rssi = (network_info->str_rssi.full) ?
+                      NUM_RSSI : (network_info->str_rssi.index);
 
        for (i = 0; i < num_rssi; i++)
-               rssi_v += network_info->str_rssi.as8RSSI[i];
+               rssi_v += network_info->str_rssi.samples[i];
 
        rssi_v /= num_rssi;
        return rssi_v;
@@ -346,13 +346,13 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo,
        } else {
                ap_index = ap_found;
        }
-       rssi_index = last_scanned_shadow[ap_index].str_rssi.u8Index;
-       last_scanned_shadow[ap_index].str_rssi.as8RSSI[rssi_index++] = pstrNetworkInfo->rssi;
+       rssi_index = last_scanned_shadow[ap_index].str_rssi.index;
+       last_scanned_shadow[ap_index].str_rssi.samples[rssi_index++] = pstrNetworkInfo->rssi;
        if (rssi_index == NUM_RSSI) {
                rssi_index = 0;
-               last_scanned_shadow[ap_index].str_rssi.u8Full = 1;
+               last_scanned_shadow[ap_index].str_rssi.full = true;
        }
-       last_scanned_shadow[ap_index].str_rssi.u8Index = rssi_index;
+       last_scanned_shadow[ap_index].str_rssi.index = rssi_index;
        last_scanned_shadow[ap_index].rssi = pstrNetworkInfo->rssi;
        last_scanned_shadow[ap_index].cap_info = pstrNetworkInfo->cap_info;
        last_scanned_shadow[ap_index].ssid_len = pstrNetworkInfo->ssid_len;