Commit ac3b5617 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by Kalle Valo

mwifiex: code rearrangement in mwifiex_usb_host_to_card()

This patch helps get rid of goto statement and improves readability.
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 5476f803
...@@ -841,7 +841,7 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep, ...@@ -841,7 +841,7 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep,
struct usb_tx_data_port *port = NULL; struct usb_tx_data_port *port = NULL;
u8 *data = (u8 *)skb->data; u8 *data = (u8 *)skb->data;
struct urb *tx_urb; struct urb *tx_urb;
int idx, ret; int idx, ret = -EINPROGRESS;
if (adapter->is_suspended) { if (adapter->is_suspended) {
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
...@@ -865,8 +865,9 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep, ...@@ -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) if (atomic_read(&port->tx_data_urb_pending)
>= MWIFIEX_TX_DATA_URB) { >= MWIFIEX_TX_DATA_URB) {
port->block_status = true; port->block_status = true;
ret = -EBUSY; adapter->data_sent =
goto done; mwifiex_usb_data_sent(adapter);
return -EBUSY;
} }
if (port->tx_data_ix >= MWIFIEX_TX_DATA_URB) if (port->tx_data_ix >= MWIFIEX_TX_DATA_URB)
port->tx_data_ix = 0; port->tx_data_ix = 0;
...@@ -902,6 +903,7 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep, ...@@ -902,6 +903,7 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep,
MWIFIEX_TX_DATA_URB) { MWIFIEX_TX_DATA_URB) {
port->block_status = true; port->block_status = true;
adapter->data_sent = mwifiex_usb_data_sent(adapter); adapter->data_sent = mwifiex_usb_data_sent(adapter);
ret = -ENOSR;
} }
if (usb_submit_urb(tx_urb, GFP_ATOMIC)) { 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, ...@@ -918,22 +920,9 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep,
else else
port->tx_data_ix = MWIFIEX_TX_DATA_URB; port->tx_data_ix = MWIFIEX_TX_DATA_URB;
} }
ret = -1;
return -1;
} else {
if (ep != card->tx_cmd_ep &&
atomic_read(&port->tx_data_urb_pending) ==
MWIFIEX_TX_DATA_URB) {
return -ENOSR;
}
} }
return -EINPROGRESS;
done:
if (ep != card->tx_cmd_ep)
adapter->data_sent = mwifiex_usb_data_sent(adapter);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment