Staging: vt6655: Simplify statement logic.
v3 cover Staging: vt6655: Simplify statement logic.
Reduce code duplication and complexity within switch case statement. The goal is to improve the readability of the statement so that the outcome of the statement is more clear. Checkpatch identified long lines and other formatting issues within some nested logic. The last commit in this patch series addresses checkpatch warnings that were not fixed by other means within the series. Some long lines were left under the rationale that removing them rendered the output more confusing.
Briana Oursler (4):
Staging: vt6655: Limit return statements.
Staging: vt6655: Move rate determination logic.
Staging: vt6655: Eliminate nested if else
Staging: vt6655: Format long lines.
Changes in v3:
- Patch 1/4 - 3/4:
- Substance unchanged, add Reviewed-by tag from Stefano Brivio.
- Patch 4/4:
- Add curly brackets per recommendation of Stefano Brivio.
Changes in v2:
- Patch 1/4:
- Per Stefano Brivio's recommendation, remove curly braces and unnecessary else clause.
- Remove unrelated newline.
- Patch 2/4:
- Remove unrelated newline.
- Change to a clearer patch subject and description per Stefano Brivio.
- Patch 3/4:
- Avoid beginning commit description with solution, per Stefano Brivio's advice.
- Move declaration of len to the same line as other unsigned ints declared in the same scope, change recommended by Stefano Brivio.
- Remove unrelated newlines.
- Patch 4/4:
- Change patch subject and description to better describe change, per Stefano Brivio.
drivers/staging/vt6655/rxtx.c | 119 +++++++++++++++------------------- 1 file changed, 54 insertions(+), 65 deletions(-)
Signature · 1 line
2.24.1
PATCH v3 1/4 Staging: vt6655: Limit return statements.
Limit return statements within context of switch case to improve readability.
--- drivers/staging/vt6655/rxtx.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-)
drivers/staging/vt6655/rxtx.c +9 -20
@@ -259,12 +259,9 @@ s_uGetDataDuration(else uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wRate, bNeedAck); -if (bNeedAck) { +if (bNeedAck) uAckTime =BBuGetFrameTime (pDevice->byPreambleType, byPktType,14 , pDevice->byTopCCKBasicRate); -return pDevice->uSIFS + uAckTime + uNextPktTime; - }else { -return pDevice->uSIFS + uNextPktTime; - } +return pDevice->uSIFS + uAckTime + uNextPktTime; }break ;
@@ -282,12 +279,9 @@ s_uGetDataDuration(else uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wRate, bNeedAck); -if (bNeedAck) { +if (bNeedAck) uAckTime =BBuGetFrameTime (pDevice->byPreambleType, byPktType,14 , pDevice->byTopOFDMBasicRate); -return pDevice->uSIFS + uAckTime + uNextPktTime; - }else { -return pDevice->uSIFS + uNextPktTime; - } +return pDevice->uSIFS + uAckTime + uNextPktTime; }break ;
@@ -323,12 +317,9 @@ s_uGetDataDuration( uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); } -if (bNeedAck) { +if (bNeedAck) uAckTime =BBuGetFrameTime (pDevice->byPreambleType, byPktType,14 , pDevice->byTopOFDMBasicRate); -return pDevice->uSIFS + uAckTime + uNextPktTime; - }else { -return pDevice->uSIFS + uNextPktTime; - } +return pDevice->uSIFS + uAckTime + uNextPktTime; }break ;
@@ -363,12 +354,10 @@ s_uGetDataDuration(else uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE1 ][wRate-RATE_18M ], bNeedAck); } -if (bNeedAck) { + +if (bNeedAck) uAckTime =BBuGetFrameTime (pDevice->byPreambleType, byPktType,14 , pDevice->byTopOFDMBasicRate); -return pDevice->uSIFS + uAckTime + uNextPktTime; - }else { -return pDevice->uSIFS + uNextPktTime; - } +return pDevice->uSIFS + uAckTime + uNextPktTime; }break ;
Signature · 1 line
2.24.1
PATCH v3 2/4 Staging: vt6655: Move rate determination logic.
In reply to Briana OurslerFactor rate setting logic out of nested if-else statement to prevent code duplication.
--- drivers/staging/vt6655/rxtx.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-)
drivers/staging/vt6655/rxtx.c +10 -20
@@ -294,23 +294,18 @@ s_uGetDataDuration(return 0 ; } }else {/* First Frag or Mid Frag */ -if (byFBOption ==AUTO_FB_0 ) { -if (wRate <RATE_18M ) - wRate =RATE_18M ; -else if (wRate >RATE_54M ) - wRate =RATE_54M ; +if (wRate <RATE_18M ) + wRate =RATE_18M ; +else if (wRate >RATE_54M ) + wRate =RATE_54M ; +if (byFBOption ==AUTO_FB_0 ) {if (uFragIdx == (uMACfragNum -2 )) uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbLastFragmentSize, wFB_Opt0[FB_RATE0 ][wRate-RATE_18M ], bNeedAck);else uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); }else {/* (byFBOption == AUTO_FB_1) */ -if (wRate <RATE_18M ) - wRate =RATE_18M ; -else if (wRate >RATE_54M ) - wRate =RATE_54M ; -if (uFragIdx == (uMACfragNum -2 )) uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbLastFragmentSize, wFB_Opt1[FB_RATE0 ][wRate-RATE_18M ], bNeedAck);else
@@ -332,23 +327,18 @@ s_uGetDataDuration(return 0 ; } }else {/* First Frag or Mid Frag */ -if (byFBOption ==AUTO_FB_0 ) { -if (wRate <RATE_18M ) - wRate =RATE_18M ; -else if (wRate >RATE_54M ) - wRate =RATE_54M ; +if (wRate <RATE_18M ) + wRate =RATE_18M ; +else if (wRate >RATE_54M ) + wRate =RATE_54M ; +if (byFBOption ==AUTO_FB_0 ) {if (uFragIdx == (uMACfragNum -2 )) uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbLastFragmentSize, wFB_Opt0[FB_RATE1 ][wRate-RATE_18M ], bNeedAck);else uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1 ][wRate-RATE_18M ], bNeedAck); }else {/* (byFBOption == AUTO_FB_1) */ -if (wRate <RATE_18M ) - wRate =RATE_18M ; -else if (wRate >RATE_54M ) - wRate =RATE_54M ; -if (uFragIdx == (uMACfragNum -2 )) uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbLastFragmentSize, wFB_Opt1[FB_RATE1 ][wRate-RATE_18M ], bNeedAck);else
Signature · 1 line
2.24.1
PATCH v3 3/4 Staging: vt6655: Eliminate nested if else
In reply to Briana OurslerEliminate nested if else statement, reduce code duplication, and shorten long lines by creating a new variable, len, to determine function input needed for s_uGetTxRsvTime.
--- drivers/staging/vt6655/rxtx.c | 43 ++++++++++++----------------------- 1 file changed, 14 insertions(+), 29 deletions(-)
drivers/staging/vt6655/rxtx.c +14 -29
@@ -239,11 +239,16 @@ s_uGetDataDuration( ) {bool bLastFrag = false; -unsigned int uAckTime =0 , uNextPktTime =0 ; +unsigned int uAckTime =0 , uNextPktTime =0 , len;if (uFragIdx == (uMACfragNum -1 )) bLastFrag = true; +if (uFragIdx == (uMACfragNum -2 )) + len = cbLastFragmentSize; +else + len = cbFrameLength; +switch (byDurType) {case DATADUR_B :/* DATADUR_B */ if (((uMACfragNum ==1 )) || bLastFrag) {/* Non Frag or Last Frag */
@@ -254,10 +259,7 @@ s_uGetDataDuration(return 0 ; } }else {/* First Frag or Mid Frag */ -if (uFragIdx == (uMACfragNum -2 )) - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbLastFragmentSize, wRate, bNeedAck); -else - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wRate, bNeedAck); + uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, wRate, bNeedAck);if (bNeedAck) uAckTime =BBuGetFrameTime (pDevice->byPreambleType, byPktType,14 , pDevice->byTopCCKBasicRate);
@@ -274,10 +276,7 @@ s_uGetDataDuration(return 0 ; } }else {/* First Frag or Mid Frag */ -if (uFragIdx == (uMACfragNum -2 )) - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbLastFragmentSize, wRate, bNeedAck); -else - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wRate, bNeedAck); + uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, wRate, bNeedAck);if (bNeedAck) uAckTime =BBuGetFrameTime (pDevice->byPreambleType, byPktType,14 , pDevice->byTopOFDMBasicRate);
@@ -300,16 +299,9 @@ s_uGetDataDuration( wRate =RATE_54M ;if (byFBOption ==AUTO_FB_0 ) { -if (uFragIdx == (uMACfragNum -2 )) - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbLastFragmentSize, wFB_Opt0[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); -else - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); - - }else {/* (byFBOption == AUTO_FB_1) */ -if (uFragIdx == (uMACfragNum -2 )) - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbLastFragmentSize, wFB_Opt1[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); -else - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); + uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, wFB_Opt0[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); + }else { + uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, wFB_Opt1[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); }if (bNeedAck)
@@ -333,16 +325,9 @@ s_uGetDataDuration( wRate =RATE_54M ;if (byFBOption ==AUTO_FB_0 ) { -if (uFragIdx == (uMACfragNum -2 )) - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbLastFragmentSize, wFB_Opt0[FB_RATE1 ][wRate-RATE_18M ], bNeedAck); -else - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1 ][wRate-RATE_18M ], bNeedAck); - - }else {/* (byFBOption == AUTO_FB_1) */ -if (uFragIdx == (uMACfragNum -2 )) - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbLastFragmentSize, wFB_Opt1[FB_RATE1 ][wRate-RATE_18M ], bNeedAck); -else - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE1 ][wRate-RATE_18M ], bNeedAck); + uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, wFB_Opt0[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); + }else { + uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, wFB_Opt1[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); }if (bNeedAck)
Signature · 1 line
2.24.1
PATCH v3 4/4 Staging: vt6655: Format long lines.
In reply to Briana OurslerAdd whitespace around '-' operator and wrap long lines. Issue found by checkpatch.pl.
---
Changes v3:
- Add curly brackets around if-statement.
drivers/staging/vt6655/rxtx.c | 51 ++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 13 deletions(-)
drivers/staging/vt6655/rxtx.c +38 -13
@@ -261,8 +261,11 @@ s_uGetDataDuration( }else {/* First Frag or Mid Frag */ uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, wRate, bNeedAck); -if (bNeedAck) - uAckTime =BBuGetFrameTime (pDevice->byPreambleType, byPktType,14 , pDevice->byTopCCKBasicRate); +if (bNeedAck) { + uAckTime =BBuGetFrameTime (pDevice->byPreambleType, + byPktType,14 , + pDevice->byTopCCKBasicRate); + }return pDevice->uSIFS + uAckTime + uNextPktTime; }break ;
@@ -276,10 +279,14 @@ s_uGetDataDuration(return 0 ; } }else {/* First Frag or Mid Frag */ - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, wRate, bNeedAck); + uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, + wRate, bNeedAck); -if (bNeedAck) - uAckTime =BBuGetFrameTime (pDevice->byPreambleType, byPktType,14 , pDevice->byTopOFDMBasicRate); +if (bNeedAck) { + uAckTime =BBuGetFrameTime (pDevice->byPreambleType, + byPktType,14 , + pDevice->byTopOFDMBasicRate); + }return pDevice->uSIFS + uAckTime + uNextPktTime; }break ;
@@ -299,13 +306,22 @@ s_uGetDataDuration( wRate =RATE_54M ;if (byFBOption ==AUTO_FB_0 ) { - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, wFB_Opt0[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); + uNextPktTime =s_uGetTxRsvTime (pDevice, + byPktType, len, + wFB_Opt0[FB_RATE0 ][wRate -RATE_18M ], + bNeedAck); }else { - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, wFB_Opt1[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); + uNextPktTime =s_uGetTxRsvTime (pDevice, + byPktType, len, + wFB_Opt1[FB_RATE0 ][wRate -RATE_18M ], + bNeedAck); } -if (bNeedAck) - uAckTime =BBuGetFrameTime (pDevice->byPreambleType, byPktType,14 , pDevice->byTopOFDMBasicRate); +if (bNeedAck) { + uAckTime =BBuGetFrameTime (pDevice->byPreambleType, + byPktType,14 , + pDevice->byTopOFDMBasicRate); + }return pDevice->uSIFS + uAckTime + uNextPktTime; }break ;
@@ -325,13 +341,22 @@ s_uGetDataDuration( wRate =RATE_54M ;if (byFBOption ==AUTO_FB_0 ) { - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, wFB_Opt0[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); + uNextPktTime =s_uGetTxRsvTime (pDevice, + byPktType, len, + wFB_Opt0[FB_RATE0 ][wRate -RATE_18M ], + bNeedAck); }else { - uNextPktTime =s_uGetTxRsvTime (pDevice, byPktType, len, wFB_Opt1[FB_RATE0 ][wRate-RATE_18M ], bNeedAck); + uNextPktTime =s_uGetTxRsvTime (pDevice, + byPktType, len, + wFB_Opt1[FB_RATE0 ][wRate -RATE_18M ], + bNeedAck); } -if (bNeedAck) - uAckTime =BBuGetFrameTime (pDevice->byPreambleType, byPktType,14 , pDevice->byTopOFDMBasicRate); +if (bNeedAck) { + uAckTime =BBuGetFrameTime (pDevice->byPreambleType, + byPktType,14 , + pDevice->byTopOFDMBasicRate); + }return pDevice->uSIFS + uAckTime + uNextPktTime; }break ;
Signature · 1 line
2.24.1
Quoted 14 lines · On Wed, 1 Apr 2020 11:03:38 -0700 Briana Oursler <[email protected]>…
Reduce code duplication and complexity within switch case statement. The goal is to improve the readability of the statement so that the outcome of the statement is more clear. Checkpatch identified long lines and other formatting issues within some nested logic. The last commit in this patch series addresses checkpatch warnings that were not fixed by other means within the series. Some long lines were left under the rationale that removing them rendered the output more confusing.
Briana Oursler (4):
Staging: vt6655: Limit return statements.
Staging: vt6655: Move rate determination logic.
Staging: vt6655: Eliminate nested if else
Staging: vt6655: Format long lines.
Quoted 7 lines
Changes in v3:
- Patch 1/4 - 3/4:
- Substance unchanged, add Reviewed-by tag from Stefano Brivio.
- Patch 4/4:
- Add curly brackets per recommendation of Stefano Brivio.
For the series,
Signature · 1 line
Stefano