staging: brcm80211: remove DHD_USE_STATIC_BUF

The DHD_USE_STATIC_BUF cannot be enabled in the build configuration,
remove it.

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

7 files changed, 1 insertions, 264 deletions

diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 15a3f5e15e3e..caabf7b563ac 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -1040,11 +1040,7 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,
         if (pkt == NULL) {
                 sd_data(("%s: Creating new %s Packet, len=%d\n",
                          __func__, write ? "TX" : "RX", buflen_u));
-#ifdef DHD_USE_STATIC_BUF
-                mypkt = PKTGET_STATIC(sd->osh, buflen_u, write ? true : false);
-#else
                 mypkt = PKTGET(sd->osh, buflen_u, write ? true : false);
-#endif                          /* DHD_USE_STATIC_BUF */
                 if (!mypkt) {
                         sd_err(("%s: PKTGET failed: len %d\n",
                                 __func__, buflen_u));
@@ -1062,11 +1058,7 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,
                 if (!write)
                         bcopy(PKTDATA(mypkt), buffer, buflen_u);
 
-#ifdef DHD_USE_STATIC_BUF
-                PKTFREE_STATIC(sd->osh, mypkt, write ? true : false);
-#else
                 PKTFREE(sd->osh, mypkt, write ? true : false);
-#endif                          /* DHD_USE_STATIC_BUF */
         } else if (((u32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) != 0) {
                 /* Case 2: We have a packet, but it is unaligned. */
 
@@ -1075,12 +1067,7 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,
 
                 sd_data(("%s: Creating aligned %s Packet, len=%d\n",
                          __func__, write ? "TX" : "RX", PKTLEN(pkt)));
-#ifdef DHD_USE_STATIC_BUF
-                mypkt = PKTGET_STATIC(sd->osh, PKTLEN(pkt),
-                                        write ? true : false);
-#else
                 mypkt = PKTGET(sd->osh, PKTLEN(pkt), write ? true : false);
-#endif                          /* DHD_USE_STATIC_BUF */
                 if (!mypkt) {
                         sd_err(("%s: PKTGET failed: len %d\n",
                                 __func__, PKTLEN(pkt)));
@@ -1098,11 +1085,7 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,
                 if (!write)
                         bcopy(PKTDATA(mypkt), PKTDATA(pkt), PKTLEN(mypkt));
 
-#ifdef DHD_USE_STATIC_BUF
-                PKTFREE_STATIC(sd->osh, mypkt, write ? true : false);
-#else
                 PKTFREE(sd->osh, mypkt, write ? true : false);
-#endif                          /* DHD_USE_STATIC_BUF */
         } else {                /* case 3: We have a packet and
                                  it is aligned. */
                 sd_data(("%s: Aligned %s Packet, direct DMA\n",
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h
index 517ac36e2061..57d06b2da46f 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd.h
+++ b/drivers/staging/brcm80211/brcmfmac/dhd.h
@@ -73,9 +73,7 @@ enum dhd_prealloc_index {
         DHD_PREALLOC_DATABUF,
         DHD_PREALLOC_OSL_BUF
 };
-#ifdef DHD_USE_STATIC_BUF
-extern void *dhd_os_prealloc(int section, unsigned long size);
-#endif
+
 /* Common structure for module and instance linkage */
 typedef struct dhd_pub {
         /* Linkage ponters */
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
index cb2d0d90b1d7..00b725ff484a 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
@@ -406,20 +406,11 @@ int dhd_prot_attach(dhd_pub_t *dhd)
 {
         dhd_prot_t *cdc;
 
-#ifndef DHD_USE_STATIC_BUF
         cdc = (dhd_prot_t *) MALLOC(dhd->osh, sizeof(dhd_prot_t));
         if (!cdc) {
                 DHD_ERROR(("%s: kmalloc failed\n", __func__));
                 goto fail;
         }
-#else
-        cdc = (dhd_prot_t *) dhd_os_prealloc(DHD_PREALLOC_PROT,
-                                                sizeof(dhd_prot_t));
-        if (!cdc) {
-                DHD_ERROR(("%s: kmalloc failed\n", __func__));
-                goto fail;
-        }
-#endif                          /* DHD_USE_STATIC_BUF */
         memset(cdc, 0, sizeof(dhd_prot_t));
 
         /* ensure that the msg buf directly follows the cdc msg struct */
@@ -436,19 +427,15 @@ int dhd_prot_attach(dhd_pub_t *dhd)
         return 0;
 
 fail:
-#ifndef DHD_USE_STATIC_BUF
         if (cdc != NULL)
                 MFREE(dhd->osh, cdc, sizeof(dhd_prot_t));
-#endif
         return BCME_NOMEM;
 }
 
 /* ~NOTE~ What if another thread is waiting on the semaphore?  Holding it? */
 void dhd_prot_detach(dhd_pub_t *dhd)
 {
-#ifndef DHD_USE_STATIC_BUF
         MFREE(dhd->osh, dhd->prot, sizeof(dhd_prot_t));
-#endif
         dhd->prot = NULL;
 }
 
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 62915c671207..9110fbe4f7f1 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -2678,27 +2678,6 @@ void dhd_os_sdtxunlock(dhd_pub_t *pub)
         dhd_os_sdunlock(pub);
 }
 
-#ifdef DHD_USE_STATIC_BUF
-void *dhd_os_prealloc(int section, unsigned long size)
-{
-#if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
-        void *alloc_ptr = NULL;
-        if (wifi_control_data && wifi_control_data->mem_prealloc) {
-                alloc_ptr = wifi_control_data->mem_prealloc(section, size);
-                if (alloc_ptr) {
-                        DHD_INFO(("success alloc section %d\n", section));
-                        bzero(alloc_ptr, size);
-                        return alloc_ptr;
-                }
-        }
-
-        DHD_ERROR(("can't alloc section %d\n", section));
-        return 0;
-#else
-        return MALLOC(0, size);
-#endif  /* #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC) */
-}
-#endif  /* DHD_USE_STATIC_BUF */
 #if defined(CONFIG_WIRELESS_EXT)