[PATCH v3 0/3] staging: wilc1000: multiple coding style changes to struct tstrRSSI
STALE3468d
7 messages,
2 authors,
2017-02-24 · open the first message on its own page
Multiple coding style changes to struct tstrRSSI. Initially reported by checkpath.pl:
Avoid CamelCase: <tstrRSSI>
Avoid CamelCase: <u8Full>
Avoid CamelCase: <u8Index>
Changes since v2: Renaming tstrRSSI and members with more descriptive names,
as suggested by Arend Van Spriel [off-list ref]
Tahia Khan (3):
staging: wilc1000: Rename struct tstrRSSI to rssi_history_buffer for
clarity and to remove camel casing.
staging: wilc1000: 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.
staging: wilc1000: Change name of str_rssi to rssi_history within the
network_info struct for clarity.
drivers/staging/wilc1000/coreconfigurator.h | 10 +++++-----
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 14 +++++++-------
2 files changed, 12 insertions(+), 12 deletions(-)
--
2.7.4
Rename struct tstrRSSI to rssi_history_buffer for clarity and to remove camel casing.
Signed-off-by: Tahia Khan <redacted>
---
drivers/staging/wilc1000/coreconfigurator.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index cff1698..1c77529 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -70,7 +70,7 @@ enum connect_status {
CONNECT_STS_FORCE_16_BIT = 0xFFFF
};
- struct tstrRSSI {
+ struct rssi_history_buffer {
u8 u8Full ;
u8 u8Index ;
s8 as8RSSI [ NUM_RSSI ]; @@ -93,7 +93,7 @@ struct network_info {
u8 * ies ;
u16 ies_len ;
void * join_params ;
- struct tstrRSSI str_rssi ;
+ struct rssi_history_buffer str_rssi ;
u64 tsf_hi ;
};
--
2.7.4
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 <redacted>
---
drivers/staging/wilc1000/coreconfigurator.h | 6 +++---
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 14 +++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 1c77529..9712d89 100644
--- 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 f7ce47c..9601ab8 100644
--- 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 ; --
2.7.4
Change name of str_rssi to rssi_history within the network_info struct for clarity.
Signed-off-by: Tahia Khan <redacted>
---
drivers/staging/wilc1000/coreconfigurator.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 9712d89..10101f8 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -93,7 +93,7 @@ struct network_info {
u8 * ies ;
u16 ies_len ;
void * join_params ;
- struct rssi_history_buffer str_rssi ;
+ struct rssi_history_buffer rssi_history ;
u64 tsf_hi ;
};
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 9601ab8..4a6fe90 100644
--- 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 . full ) ?
- NUM_RSSI : ( network_info -> str_rssi . index );
+ u8 num_rssi = ( network_info -> rssi_history . full ) ?
+ NUM_RSSI : ( network_info -> rssi_history . index );
for ( i = 0 ; i < num_rssi ; i ++ )
- rssi_v += network_info -> str_rssi . samples [ i ];
+ rssi_v += network_info -> rssi_history . 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 . index ;
- last_scanned_shadow [ ap_index ]. str_rssi . samples [ rssi_index ++ ] = pstrNetworkInfo -> rssi ;
+ rssi_index = last_scanned_shadow [ ap_index ]. rssi_history . index ;
+ last_scanned_shadow [ ap_index ]. rssi_history . samples [ rssi_index ++ ] = pstrNetworkInfo -> rssi ;
if ( rssi_index == NUM_RSSI ) {
rssi_index = 0 ;
- last_scanned_shadow [ ap_index ]. str_rssi . full = true ;
+ last_scanned_shadow [ ap_index ]. rssi_history . full = true ;
}
- last_scanned_shadow [ ap_index ]. str_rssi . index = rssi_index ;
+ last_scanned_shadow [ ap_index ]. rssi_history . 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 ; --
2.7.4
On Fri, 24 Feb 2017, Tahia Khan wrote:
Change name of str_rssi to rssi_history within the network_info struct for clarity.
Signed-off-by: Tahia Khan <redacted>
Acked-by: Julia Lawall <redacted>
Good job at cutting up the patch in a meaningful way.
julia
quoted hunk ---
drivers/staging/wilc1000/coreconfigurator.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 9712d89..10101f8 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -93,7 +93,7 @@ struct network_info {
u8 * ies ;
u16 ies_len ;
void * join_params ;
- struct rssi_history_buffer str_rssi ;
+ struct rssi_history_buffer rssi_history ;
u64 tsf_hi ;
};
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 9601ab8..4a6fe90 100644
--- 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 . full ) ?
- NUM_RSSI : ( network_info -> str_rssi . index );
+ u8 num_rssi = ( network_info -> rssi_history . full ) ?
+ NUM_RSSI : ( network_info -> rssi_history . index );
for ( i = 0 ; i < num_rssi ; i ++ )
- rssi_v += network_info -> str_rssi . samples [ i ];
+ rssi_v += network_info -> rssi_history . 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 . index ;
- last_scanned_shadow [ ap_index ]. str_rssi . samples [ rssi_index ++ ] = pstrNetworkInfo -> rssi ;
+ rssi_index = last_scanned_shadow [ ap_index ]. rssi_history . index ;
+ last_scanned_shadow [ ap_index ]. rssi_history . samples [ rssi_index ++ ] = pstrNetworkInfo -> rssi ;
if ( rssi_index == NUM_RSSI ) {
rssi_index = 0 ;
- last_scanned_shadow [ ap_index ]. str_rssi . full = true ;
+ last_scanned_shadow [ ap_index ]. rssi_history . full = true ;
}
- last_scanned_shadow [ ap_index ]. str_rssi . index = rssi_index ;
+ last_scanned_shadow [ ap_index ]. rssi_history . 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 ;
- - 2.7.4
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
To post to this group, send email to outreachy-kernel@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/6fd3f34baa31c00a77e2805d5d8a820b3ac7a43f.1487912400.git.tahia.khan%40gmail.com .
For more options, visit https://groups.google.com/d/optout .
On Fri, 24 Feb 2017, Tahia Khan wrote:
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.
Acked-by: Julia Lawall <redacted>
Maybe the second line of the commit message is a little too long. It is
under 80 characters, but they come out a bit indented in the git log, so a
little shorter is better.
julia
quoted hunk
Signed-off-by: Tahia Khan <redacted>
---
drivers/staging/wilc1000/coreconfigurator.h | 6 +++---
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 14 +++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 1c77529..9712d89 100644
--- 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 f7ce47c..9601ab8 100644
--- 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 ;
- - 2.7.4
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
To post to this group, send email to outreachy-kernel@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/e4e0e4da09635d0cb7ef43223022490b6de739a8.1487912400.git.tahia.khan%40gmail.com .
For more options, visit https://groups.google.com/d/optout .
On Fri, 24 Feb 2017, Tahia Khan wrote:
Rename struct tstrRSSI to rssi_history_buffer for clarity and to remove camel casing.
Here the commit log messge line is definitely too long.
julia
quoted hunk
Signed-off-by: Tahia Khan <redacted>
---
drivers/staging/wilc1000/coreconfigurator.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index cff1698..1c77529 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -70,7 +70,7 @@ enum connect_status {
CONNECT_STS_FORCE_16_BIT = 0xFFFF
};
- struct tstrRSSI {
+ struct rssi_history_buffer {
u8 u8Full ;
u8 u8Index ;
s8 as8RSSI [ NUM_RSSI ]; @@ -93,7 +93,7 @@ struct network_info {
u8 * ies ;
u16 ies_len ;
void * join_params ;
- struct tstrRSSI str_rssi ;
+ struct rssi_history_buffer str_rssi ;
u64 tsf_hi ;
};
- - 2.7.4
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
To post to this group, send email to outreachy-kernel@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/da73d1aef379243ba94a5c1a4e1d6663160451fd.1487912400.git.tahia.khan%40gmail.com .
For more options, visit https://groups.google.com/d/optout .