staging: wilc1000: remove variable tx_buffer_size

This patch removes unnecessary two variables tx_buffer_size and just use
LINUX_TX_SIZE as argument.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 5bb5588a9aa9652bb24e9eafe0c3ce60728bbc99..62ca83fa15511baa9e97e2bb52bd0ae1ccc5a81a 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1056,7 +1056,6 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, linux_wlan_t *nic)
        PRINT_D(INIT_DBG, "Linux to Wlan services ...\n");
 
        nwi->os_context.os_private = (void *)nic;
-       nwi->os_context.tx_buffer_size = LINUX_TX_SIZE;
        nwi->os_context.txq_critical_section = (void *)&g_linux_wlan->txq_cs;
 #if defined(MEMORY_STATIC)
        nwi->os_context.rx_buffer_size = LINUX_RX_SIZE;

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index bd7c59dd1af07ce09c0fc046fa868bc777aa6cc1..9217b1864ed6e068e64008b1b8b11ab8550cdb89 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -58,7 +58,6 @@ typedef struct {
        /**
         *      TX buffer
         **/
-       u32 tx_buffer_size;
        u8 *tx_buffer;
        u32 tx_buffer_offset;
 
@@ -873,7 +872,7 @@ static int wilc_wlan_handle_txq(u32 *pu32TxqCount)
                                if (vmm_sz & 0x3) {                                                                                                     /* has to be word aligned */
                                        vmm_sz = (vmm_sz + 4) & ~0x3;
                                }
-                               if ((sum + vmm_sz) > p->tx_buffer_size) {
+                               if ((sum + vmm_sz) > LINUX_TX_SIZE) {
                                        break;
                                }
                                PRINT_D(TX_DBG, "VMM Size AFTER alignment = %d\n", vmm_sz);
@@ -1970,7 +1969,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
        memcpy((void *)&g_wlan.io_func, (void *)&inp->io_func, sizeof(wilc_wlan_io_func_t));
        g_wlan.txq_lock = inp->os_context.txq_critical_section;
 
-       g_wlan.tx_buffer_size = inp->os_context.tx_buffer_size;
 #if defined (MEMORY_STATIC)
        g_wlan.rx_buffer_size = inp->os_context.rx_buffer_size;
 #endif
@@ -2017,7 +2015,7 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
         *      alloc tx, rx buffer
         **/
        if (g_wlan.tx_buffer == NULL)
-               g_wlan.tx_buffer = kmalloc(g_wlan.tx_buffer_size, GFP_KERNEL);
+               g_wlan.tx_buffer = kmalloc(LINUX_TX_SIZE, GFP_KERNEL);
        PRINT_D(TX_DBG, "g_wlan.tx_buffer = %p\n", g_wlan.tx_buffer);
 
        if (g_wlan.tx_buffer == NULL) {

diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index 74bfa6d36823299bd3541ceb5afec5c4e8c40e3c..1dfc673cd574798e64b15b361077119bb5bba050 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -107,7 +107,6 @@ typedef struct {
 
 typedef struct {
        void *os_private;
-       u32 tx_buffer_size;
        void *txq_critical_section;
 #if defined(MEMORY_STATIC)
        u32 rx_buffer_size;