mwifiex: code rearrangement in mwifiex_usb_host_to_card()

This patch helps get rid of goto statement and improves readability.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
index 8fd51e42ea5e5a1b4d9165b21df1e584b7442515..73eb0846db210be16476e94f0d7f872992154112 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/usb.c
+++ b/drivers/net/wireless/marvell/mwifiex/usb.c
@@ -841,7 +841,7 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep,
        struct usb_tx_data_port *port = NULL;
        u8 *data = (u8 *)skb->data;
        struct urb *tx_urb;
-       int idx, ret;
+       int idx, ret = -EINPROGRESS;
 
        if (adapter->is_suspended) {
                mwifiex_dbg(adapter, ERROR,
@@ -865,8 +865,9 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep,
                                if (atomic_read(&port->tx_data_urb_pending)
                                    >= MWIFIEX_TX_DATA_URB) {
                                        port->block_status = true;
-                                       ret = -EBUSY;
-                                       goto done;
+                                       adapter->data_sent =
+                                               mwifiex_usb_data_sent(adapter);
+                                       return -EBUSY;
                                }
                                if (port->tx_data_ix >= MWIFIEX_TX_DATA_URB)
                                        port->tx_data_ix = 0;
@@ -902,6 +903,7 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep,
                                        MWIFIEX_TX_DATA_URB) {
                port->block_status = true;
                adapter->data_sent = mwifiex_usb_data_sent(adapter);
+               ret = -ENOSR;
        }
 
        if (usb_submit_urb(tx_urb, GFP_ATOMIC)) {
@@ -918,22 +920,9 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep,
                        else
                                port->tx_data_ix = MWIFIEX_TX_DATA_URB;
                }
-
-               return -1;
-       } else {
-               if (ep != card->tx_cmd_ep &&
-                   atomic_read(&port->tx_data_urb_pending) ==
-                                                       MWIFIEX_TX_DATA_URB) {
-                       return -ENOSR;
-               }
+               ret = -1;
        }
 
-       return -EINPROGRESS;
-
-done:
-       if (ep != card->tx_cmd_ep)
-               adapter->data_sent = mwifiex_usb_data_sent(adapter);
-
        return ret;
 }