From: Malcolm Priestley Date: Thu, 10 Jul 2014 18:56:13 +0000 (+0100) Subject: staging: vt6656: s_vGenerateTxParameter remove else from if statements X-Git-Tag: firefly_0821_release~176^2~3491^2~953 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=da9ef9f42bb21b49afd6c63b3b6c05c41fedf3d0;p=firefly-linux-kernel-4.4.55.git staging: vt6656: s_vGenerateTxParameter remove else from if statements The function returns out at if statements so drop else. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 61138079eacb..0d0a95672122 100644 --- 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,