staging: vt6656: s_vGenerateTxParameter remove else from if statements

The function returns out at if statements so drop else.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 61138079eacb77dcca12c4b09e7d637468a3f050..0d0a9567212226bc98f52f88ff66b1f076c8131f 100644 (file)
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -717,25 +717,20 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context,
                        return vnt_rxtx_rts(tx_context, &tx_buffer->tx_head,
                                        byPktType, cbFrameSize, bNeedACK,
                                                wCurrentRate, need_mic);
-               } else {
-                       if (need_mic)
-                               *mic_hdr = &tx_buffer->
-                                               tx_head.tx_cts.tx.mic.hdr;
-
-                       return vnt_rxtx_cts(tx_context, &tx_buffer->tx_head,
-                                       byPktType, cbFrameSize, bNeedACK,
-                                               wCurrentRate, need_mic);
                }
-       } else {
+
                if (need_mic)
-                       *mic_hdr = &tx_buffer->tx_head.tx_ab.tx.mic.hdr;
+                       *mic_hdr = &tx_buffer->tx_head.tx_cts.tx.mic.hdr;
 
-               return vnt_rxtx_ab(tx_context, &tx_buffer->tx_head,
-                                       byPktType, cbFrameSize, bNeedACK,
-                                       wCurrentRate, need_rts, need_mic);
+               return vnt_rxtx_cts(tx_context, &tx_buffer->tx_head, byPktType,
+                               cbFrameSize, bNeedACK, wCurrentRate, need_mic);
        }
 
-       return 0;
+       if (need_mic)
+               *mic_hdr = &tx_buffer->tx_head.tx_ab.tx.mic.hdr;
+
+       return vnt_rxtx_ab(tx_context, &tx_buffer->tx_head, byPktType,
+               cbFrameSize, bNeedACK, wCurrentRate, need_rts, need_mic);
 }
 
 static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context,