From: Briana Oursler Date: Wed, 1 Apr 2020 18:03:42 +0000 (-0700) Subject: Staging: vt6655: Format long lines. X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2f7ccc387cf3b2e896dadbe5252502baf56473a4;p=linux.git Staging: vt6655: Format long lines. Add whitespace around '-' operator and wrap long lines. Issue found by checkpatch.pl. Signed-off-by: Briana Oursler Reviewed-by: Stefano Brivio Link: https://lore.kernel.org/r/e1c9fc822f1576f9896799fea6c467457cf0f6da.1585763457.git.briana.oursler@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 72bb49c064c7b..81d0deba80ebb 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -265,8 +265,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; @@ -280,10 +283,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; @@ -303,13 +310,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; @@ -329,13 +345,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;