staging: vt6655: return at the ond of case body
authorMatej Dujava <mdujava@kocurkovo.cz>
Sun, 3 May 2020 13:29:11 +0000 (15:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 May 2020 10:31:19 +0000 (12:31 +0200)
This patch will unify exit point for s_uGetDataDuration function.

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

index 61f7077bb75f2a63edd1c3e7d22e1985621b574a..c4d62c27f1c1f4d4a8ce48a127491c6619d0a136 100644 (file)
@@ -264,14 +264,12 @@ s_uGetDataDuration(
                if ((uMACfragNum == 1) || bLastFrag) {
                        if (!bNeedAck)
                                return 0;
-                       return pDevice->uSIFS + uAckTime;
                } else {
                        /* First Frag or Mid Frag */
                        uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len, wRate, bNeedAck);
-
-                       return pDevice->uSIFS + uAckTime + uNextPktTime;
                }
-               break;
+
+               return pDevice->uSIFS + uAckTime + uNextPktTime;
 
        case DATADUR_A:    /* DATADUR_A */
                if (bNeedAck) {
@@ -283,15 +281,13 @@ s_uGetDataDuration(
                if ((uMACfragNum == 1) || bLastFrag) {
                        if (!bNeedAck)
                                return 0;
-                       return pDevice->uSIFS + uAckTime;
                } else {
                        /* First Frag or Mid Frag */
                        uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType, len,
                                                       wRate, bNeedAck);
-
-                       return pDevice->uSIFS + uAckTime + uNextPktTime;
                }
-               break;
+
+               return pDevice->uSIFS + uAckTime + uNextPktTime;
 
        case DATADUR_A_F0:    /* DATADUR_A_F0 */
        case DATADUR_A_F1:    /* DATADUR_A_F1 */
@@ -304,7 +300,6 @@ s_uGetDataDuration(
                if ((uMACfragNum == 1) || bLastFrag) {
                        if (!bNeedAck)
                                return 0;
-                       return pDevice->uSIFS + uAckTime;
                } else {
                        /* First Frag or Mid Frag */
                        if (wRate < RATE_18M)
@@ -323,10 +318,9 @@ s_uGetDataDuration(
                                                               wFB_Opt1[FB_RATE0][wRate - RATE_18M],
                                                               bNeedAck);
                        }
-
-                       return pDevice->uSIFS + uAckTime + uNextPktTime;
                }
-               break;
+
+               return pDevice->uSIFS + uAckTime + uNextPktTime;
 
        default:
                break;