wl1271: Remove unnecessary rx_descriptor memory allocation

Remove unnecessary RX descriptor memory allocation from the driver. The
allocation was a remnant of the wl1251 driver.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index 1e399a2a7f6bf42be564988d694d999ade62a18a..fca59687041e7ba19b315d3110383edc20a44dba 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -429,7 +429,6 @@ struct wl1271 {
        u32 buffer_32;
        u32 buffer_cmd;
        u32 buffer_busyword[WL1271_BUSY_WORD_CNT];
-       struct wl1271_rx_descriptor *rx_descriptor;
 
        struct wl1271_fw_status *fw_status;
        struct wl1271_tx_hw_res_if *tx_res_if;

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 7d70f4168b2f4c1938a7c04315611ee4d9eaed59..dfa08a1886320ddabc23f0e8d4fe8f2272235f17 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1893,13 +1893,6 @@ static int __devinit wl1271_probe(struct spi_device *spi)
        wl->state = WL1271_STATE_OFF;
        mutex_init(&wl->mutex);
 
-       wl->rx_descriptor = kmalloc(sizeof(*wl->rx_descriptor), GFP_KERNEL);
-       if (!wl->rx_descriptor) {
-               wl1271_error("could not allocate memory for rx descriptor");
-               ret = -ENOMEM;
-               goto out_free;
-       }
-
        /* This is the only SPI value that we need to set here, the rest
         * comes from the board-peripherals file */
        spi->bits_per_word = 32;
@@ -1965,9 +1958,6 @@ static int __devinit wl1271_probe(struct spi_device *spi)
        free_irq(wl->irq, wl);
 
  out_free:
-       kfree(wl->rx_descriptor);
-       wl->rx_descriptor = NULL;
-
        ieee80211_free_hw(hw);
 
        return ret;
@@ -1988,9 +1978,6 @@ static int __devexit wl1271_remove(struct spi_device *spi)
        kfree(wl->nvs);
        wl->nvs = NULL;
 
-       kfree(wl->rx_descriptor);
-       wl->rx_descriptor = NULL;
-
        kfree(wl->fw_status);
        kfree(wl->tx_res_if);