wl12xx: optimise elp wakeup and sleep calls

[mv-sheeva.git] / drivers / net / wireless / wl12xx / cmd.c

diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index 04e8401fcbede045c7ba2383c0563829ad495a78..fb4e9962d2c2932868325e6fd6fd6ee112f5dce1 100644 (file)
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -32,8 +32,6 @@ int wl12xx_cmd_send(struct wl12xx *wl, u16 id, void *buf, size_t len)
 
        WARN_ON(len % 4 != 0);
 
-       wl12xx_ps_elp_wakeup(wl);
-
        wl12xx_spi_mem_write(wl, wl->cmd_box_addr, buf, len);
 
        wl12xx_reg_write32(wl, ACX_REG_INTERRUPT_TRIG, INTR_TRIG_CMD);
@@ -57,8 +55,6 @@ int wl12xx_cmd_send(struct wl12xx *wl, u16 id, void *buf, size_t len)
                           wl->chip.intr_cmd_complete);
 
 out:
-       wl12xx_ps_elp_sleep(wl);
-
        return ret;
 }
 
@@ -91,13 +87,8 @@ int wl12xx_cmd_test(struct wl12xx *wl, void *buf, size_t buf_len, u8 answer)
                 * The answer would be a wl12xx_command, where the
                 * parameter array contains the actual answer.
                 */
-
-               wl12xx_ps_elp_wakeup(wl);
-
                wl12xx_spi_mem_read(wl, wl->cmd_box_addr, buf, buf_len);
 
-               wl12xx_ps_elp_sleep(wl);
-
                cmd_answer = buf;
 
                if (cmd_answer->header.status != CMD_STATUS_SUCCESS)
@@ -134,13 +125,9 @@ int wl12xx_cmd_interrogate(struct wl12xx *wl, u16 id, void *buf, size_t len)
                goto out;
        }
 
-       wl12xx_ps_elp_wakeup(wl);
-
        /* the interrogate command got in, we can read the answer */
        wl12xx_spi_mem_read(wl, wl->cmd_box_addr, buf, len);
 
-       wl12xx_ps_elp_sleep(wl);
-
        acx = buf;
        if (acx->cmd.status != CMD_STATUS_SUCCESS)
                wl12xx_error("INTERROGATE command error: %d",