libertas: introduce and use lbs_complete_command() for command completion

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index a809f8f9997b..89f83165e04f 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -717,8 +717,7 @@ int lbs_process_rx_command(struct lbs_private *priv)
                         lbs_deb_host("CMD_RESP: PS action 0x%X\n", action);
                 }
 
-                __lbs_cleanup_and_insert_cmd(priv, priv->cur_cmd);
-                priv->cur_cmd = NULL;
+                lbs_complete_command(priv, priv->cur_cmd, result);
                 spin_unlock_irqrestore(&priv->driver_lock, flags);
 
                 ret = 0;
@@ -739,9 +738,7 @@ int lbs_process_rx_command(struct lbs_private *priv)
                         break;
 
                 }
-
-                __lbs_cleanup_and_insert_cmd(priv, priv->cur_cmd);
-                priv->cur_cmd = NULL;
+                lbs_complete_command(priv, priv->cur_cmd, result);
                 spin_unlock_irqrestore(&priv->driver_lock, flags);
 
                 ret = -1;
@@ -760,8 +757,7 @@ int lbs_process_rx_command(struct lbs_private *priv)
 
         if (priv->cur_cmd) {
                 /* Clean up and Put current command back to cmdfreeq */
-                __lbs_cleanup_and_insert_cmd(priv, priv->cur_cmd);
-                priv->cur_cmd = NULL;
+                lbs_complete_command(priv, priv->cur_cmd, result);
         }
         spin_unlock_irqrestore(&priv->driver_lock, flags);