wl12xx: allocate buffer spi read/write command buffer kzalloc()

Needed for DMA safe transfers.

Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/wl12xx/spi.c
index fb7c52c4d9c4dc91b968d3a0a91635620a5f3a28..939274291a0726cd8946f2701c1163d07786d1f0 100644 (file)
--- a/drivers/net/wireless/wl12xx/spi.c
+++ b/drivers/net/wireless/wl12xx/spi.c
@@ -263,17 +263,19 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf,
        struct spi_transfer t[3];
        struct spi_message m;
        char busy_buf[TNETWIF_READ_OFFSET_BYTES];
-       u32 cmd;
+       u32 *cmd;
 
-       cmd = 0;
-       cmd |= WSPI_CMD_READ;
-       cmd |= (len << WSPI_CMD_BYTE_LENGTH_OFFSET) & WSPI_CMD_BYTE_LENGTH;
-       cmd |= addr & WSPI_CMD_BYTE_ADDR;
+       cmd = &wl->buffer_cmd;
+
+       *cmd = 0;
+       *cmd |= WSPI_CMD_READ;
+       *cmd |= (len << WSPI_CMD_BYTE_LENGTH_OFFSET) & WSPI_CMD_BYTE_LENGTH;
+       *cmd |= addr & WSPI_CMD_BYTE_ADDR;
 
        spi_message_init(&m);
        memset(t, 0, sizeof(t));
 
-       t[0].tx_buf = &cmd;
+       t[0].tx_buf = cmd;
        t[0].len = 4;
        spi_message_add_tail(&t[0], &m);
 
@@ -290,7 +292,7 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf,
 
        /* FIXME: check busy words */
 
-       wl12xx_dump(DEBUG_SPI, "spi_read cmd -> ", &cmd, sizeof(cmd));
+       wl12xx_dump(DEBUG_SPI, "spi_read cmd -> ", cmd, sizeof(*cmd));
        wl12xx_dump(DEBUG_SPI, "spi_read buf <- ", buf, len);
 }
 
@@ -299,18 +301,20 @@ void wl12xx_spi_write(struct wl12xx *wl, int addr, void *buf,
 {
        struct spi_transfer t[2];
        struct spi_message m;
-       u32 cmd;
+       u32 *cmd;
 
-       cmd = 0;
-       cmd |= WSPI_CMD_WRITE;
-       cmd |= (len << WSPI_CMD_BYTE_LENGTH_OFFSET) & WSPI_CMD_BYTE_LENGTH;
-       cmd |= addr & WSPI_CMD_BYTE_ADDR;
+       cmd = &wl->buffer_cmd;
+
+       *cmd = 0;
+       *cmd |= WSPI_CMD_WRITE;
+       *cmd |= (len << WSPI_CMD_BYTE_LENGTH_OFFSET) & WSPI_CMD_BYTE_LENGTH;
+       *cmd |= addr & WSPI_CMD_BYTE_ADDR;
 
        spi_message_init(&m);
        memset(t, 0, sizeof(t));
 
-       t[0].tx_buf = &cmd;
-       t[0].len = sizeof(cmd);
+       t[0].tx_buf = cmd;
+       t[0].len = sizeof(*cmd);
        spi_message_add_tail(&t[0], &m);
 
        t[1].tx_buf = buf;
@@ -319,7 +323,7 @@ void wl12xx_spi_write(struct wl12xx *wl, int addr, void *buf,
 
        spi_sync(wl->spi, &m);
 
-       wl12xx_dump(DEBUG_SPI, "spi_write cmd -> ", &cmd, sizeof(cmd));
+       wl12xx_dump(DEBUG_SPI, "spi_write cmd -> ", cmd, sizeof(*cmd));
        wl12xx_dump(DEBUG_SPI, "spi_write buf -> ", buf, len);
 }
 

diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index f252a11892548d11a1e3f0224cbcab3f5c491a42..586593563511511ff7579d99580b0f9cf3ad8b76 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -384,6 +384,7 @@ struct wl12xx {
        struct wl12xx_debugfs debugfs;
 
        u32 buffer_32;
+       u32 buffer_cmd;
 };
 
 int wl12xx_plt_start(struct wl12xx *wl);