libertas: convert DEEP_SLEEP timer to a direct command

Other uses were already used direct command paths.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 8 insertions, 12 deletions

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 5c7bb3551fb5..f19a36fa57da 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1208,10 +1208,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
         cmdptr->result = 0;
 
         switch (cmd_no) {
-        case CMD_802_11_DEEP_SLEEP:
-                cmdptr->command = cpu_to_le16(CMD_802_11_DEEP_SLEEP);
-                cmdptr->size = cpu_to_le16(sizeof(struct cmd_header));
-                break;
         default:
                 lbs_pr_err("PREP_CMD: unknown command 0x%04x\n", cmd_no);
                 ret = -1;
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 6c0e814bbe60..2398fc5170ef 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -658,7 +658,6 @@ out:
 static void auto_deepsleep_timer_fn(unsigned long data)
 {
         struct lbs_private *priv = (struct lbs_private *)data;
-        int ret;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
@@ -666,14 +665,15 @@ static void auto_deepsleep_timer_fn(unsigned long data)
                 priv->is_activity_detected = 0;
         } else {
                 if (priv->is_auto_deep_sleep_enabled &&
-                                (!priv->wakeup_dev_required) &&
-                                (priv->connect_status != LBS_CONNECTED)) {
+                    (!priv->wakeup_dev_required) &&
+                    (priv->connect_status != LBS_CONNECTED)) {
+                        struct cmd_header cmd;
+
                         lbs_deb_main("Entering auto deep sleep mode...\n");
-                        ret = lbs_prepare_and_send_command(priv,
-                                        CMD_802_11_DEEP_SLEEP, 0,
-                                        0, 0, NULL);
-                        if (ret)
-                                lbs_pr_err("Enter Deep Sleep command failed\n");
+                        memset(&cmd, 0, sizeof(cmd));
+                        cmd.size = cpu_to_le16(sizeof(cmd));
+                        lbs_cmd_async(priv, CMD_802_11_DEEP_SLEEP, &cmd,
+                                        sizeof(cmd));
                 }
         }
         mod_timer(&priv->auto_deepsleep_timer , jiffies +