staging: vt6655: remove else after return and invert condition
authorMatej Dujava <mdujava@kocurkovo.cz>
Sun, 3 May 2020 13:29:10 +0000 (15:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 May 2020 10:31:19 +0000 (12:31 +0200)
This patch will prepare us to make return at the end of case body

Signed-off-by: Matej Dujava <mdujava@kocurkovo.cz>
Link: https://lore.kernel.org/r/1588512552-12297-4-git-send-email-mdujava@kocurkovo.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/rxtx.c

index 01ceace253a412f00edacd89b34aacf5fd7b5254..61f7077bb75f2a63edd1c3e7d22e1985621b574a 100644 (file)
@@ -260,13 +260,13 @@ s_uGetDataDuration(
                                                     byPktType, 14,
                                                     pDevice->byTopCCKBasicRate);
                }
-               if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */
-                       if (bNeedAck) {
-                               return pDevice->uSIFS + uAckTime;
-                       } else {
+               /* Non Frag or Last Frag */
+               if ((uMACfragNum == 1) || bLastFrag) {
+                       if (!bNeedAck)
                                return 0;
-                       }
-               } else {/* First Frag or Mid Frag */
+                       return pDevice->uSIFS + uAckTime;
+               } else {
+                       /* First Frag or Mid Frag */
                        uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wRate, bNeedAck);
 
                        return pDevice->uSIFS + uAckTime + uNextPktTime;
@@ -279,13 +279,13 @@ s_uGetDataDuration(
                                                     byPktType, 14,
                                                     pDevice->byTopOFDMBasicRate);
                }
-               if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */
-                       if (bNeedAck) {
-                               return pDevice->uSIFS + uAckTime;
-                       } else {
+               /* Non Frag or Last Frag */
+               if ((uMACfragNum == 1) || bLastFrag) {
+                       if (!bNeedAck)
                                return 0;
-                       }
-               } else {/* First Frag or Mid Frag */
+                       return pDevice->uSIFS + uAckTime;
+               } else {
+                       /* First Frag or Mid Frag */
                        uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len,
                                                       wRate, bNeedAck);
 
@@ -300,13 +300,13 @@ s_uGetDataDuration(
                                                     byPktType, 14,
                                                     pDevice->byTopOFDMBasicRate);
                }
-               if (((uMACfragNum == 1)) || bLastFrag) { /* Non Frag or Last Frag */
-                       if (bNeedAck) {
-                               return pDevice->uSIFS + uAckTime;
-                       } else {
+               /* Non Frag or Last Frag */
+               if ((uMACfragNum == 1) || bLastFrag) {
+                       if (!bNeedAck)
                                return 0;
-                       }
-               } else { /* First Frag or Mid Frag */
+                       return pDevice->uSIFS + uAckTime;
+               } else {
+                       /* First Frag or Mid Frag */
                        if (wRate < RATE_18M)
                                wRate = RATE_18M;
                        else if (wRate > RATE_54M)