diff options
| author | mike.rapoport@gmail.com <mike.rapoport@gmail.com> | 2010-10-13 00:09:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-14 12:27:50 -0700 |
| commit | 6a92fdf1b923fa5b6d6dd08a7bba80fb3d9e5eaf (patch) | |
| tree | f6dd661c97f394f2d3fc63cc051437221e80d9f1 /drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | |
| parent | 6ddcfdcf919463469496132731671ebb5f9908e9 (diff) | |
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>
Diffstat (limited to 'drivers/staging/brcm80211/brcmfmac/dhd_sdio.c')
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 6b91211ae314..e0e1d2b0a813 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -5382,7 +5382,6 @@ static bool dhdsdio_probe_malloc(dhd_bus_t *bus, osl_t *osh, void *sdh) { DHD_TRACE(("%s: Enter\n", __func__)); -#ifndef DHD_USE_STATIC_BUF if (bus->dhd->maxctl) { bus->rxblen = roundup((bus->dhd->maxctl + SDPCM_HDRLEN), @@ -5405,26 +5404,6 @@ static bool dhdsdio_probe_malloc(dhd_bus_t *bus, osl_t *osh, void *sdh) MFREE(osh, bus->rxbuf, bus->rxblen); goto fail; } -#else - if (bus->dhd->maxctl) { - bus->rxblen = - roundup((bus->dhd->maxctl + SDPCM_HDRLEN), - ALIGNMENT) + DHD_SDALIGN; - bus->rxbuf = dhd_os_prealloc(DHD_PREALLOC_RXBUF, bus->rxblen); - if (!(bus->rxbuf)) { - DHD_ERROR(("%s: MALLOC of %d-byte rxbuf failed\n", - __func__, bus->rxblen)); - goto fail; - } - } - /* Allocate buffer to receive glomed packet */ - bus->databuf = dhd_os_prealloc(DHD_PREALLOC_DATABUF, MAX_DATA_BUF); - if (!(bus->databuf)) { - DHD_ERROR(("%s: MALLOC of %d-byte databuf failed\n", - __func__, MAX_DATA_BUF)); - goto fail; - } -#endif /* DHD_USE_STATIC_BUF */ /* Align the buffer */ if ((uintptr) bus->databuf % DHD_SDALIGN) @@ -5583,17 +5562,13 @@ static void dhdsdio_release_malloc(dhd_bus_t *bus, osl_t *osh) return; if (bus->rxbuf) { -#ifndef DHD_USE_STATIC_BUF MFREE(osh, bus->rxbuf, bus->rxblen); -#endif bus->rxctl = bus->rxbuf = NULL; bus->rxlen = 0; } if (bus->databuf) { -#ifndef DHD_USE_STATIC_BUF MFREE(osh, bus->databuf, MAX_DATA_BUF); -#endif bus->databuf = NULL; } } |