staging: vt6655: Remove multiple assignments.

Remove multiple assignments at initialization and in computations to
better match Linux style. Issue found by checkpatch.pl.

Signed-off-by: Briana Oursler <briana.oursler@gmail.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Link: https://lore.kernel.org/r/20200327192700.12289-1-briana.oursler@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 37fcc42ed000b9af1e3fbfb07e8bfe19fc0100ed..a1ddd7990e81673d387b83c520ec34fffc8f88ee 100644 (file)
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -195,21 +195,25 @@ s_uGetRTSCTSRsvTime(
        unsigned short wCurrentRate
 )
 {
-       unsigned int uRrvTime, uRTSTime, uCTSTime, uAckTime, uDataTime;
-
-       uRrvTime = uRTSTime = uCTSTime = uAckTime = uDataTime = 0;
+       unsigned int uRrvTime = 0;
+       unsigned int uRTSTime = 0;
+       unsigned int uCTSTime = 0;
+       unsigned int uAckTime = 0;
+       unsigned int uDataTime = 0;
 
        uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wCurrentRate);
        if (byRTSRsvType == 0) { /* RTSTxRrvTime_bb */
                uRTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 20, pDevice->byTopCCKBasicRate);
-               uCTSTime = uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
+               uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
+               uCTSTime = uAckTime;
        } else if (byRTSRsvType == 1) { /* RTSTxRrvTime_ba, only in 2.4GHZ */
                uRTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 20, pDevice->byTopCCKBasicRate);
                uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
                uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
        } else if (byRTSRsvType == 2) { /* RTSTxRrvTime_aa */
                uRTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 20, pDevice->byTopOFDMBasicRate);
-               uCTSTime = uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
+               uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
+               uCTSTime = uAckTime;
        } else if (byRTSRsvType == 3) { /* CTSTxRrvTime_ba, only in 2.4GHZ */
                uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
                uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
@@ -1040,16 +1044,14 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
        bool bRTS = (bool)(fifo_ctl & FIFOCTL_RTS);
        struct vnt_tx_desc *ptdCurr;
        unsigned int cbHeaderLength = 0;
-       void *pvRrvTime;
-       struct vnt_mic_hdr *pMICHDR;
-       void *pvRTS;
-       void *pvCTS;
-       void *pvTxDataHd;
+       void *pvRrvTime = NULL;
+       struct vnt_mic_hdr *pMICHDR = NULL;
+       void *pvRTS = NULL;
+       void *pvCTS = NULL;
+       void *pvTxDataHd = NULL;
        unsigned short wTxBufSize;   /* FFinfo size */
        unsigned char byFBOption = AUTO_FB_NONE;
 
-       pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL;
-
        cbFrameSize = skb->len + 4;
 
        if (info->control.hw_key) {