diff options
| author | mike.rapoport@gmail.com | 2010-10-13 00:09:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-10-14 21:28:18 +0200 |
| commit | 97e17d0e7bb861c197e50433325bf2f5f9871f90 (patch) | |
| tree | 92846f9a34e565c759b29c1dca958ca965c98dba /drivers/staging/brcm80211/util | |
| parent | staging: brcm80211: remove DHD_USE_STATIC_BUF (diff) | |
| download | kernel-qcow2-linux-97e17d0e7bb861c197e50433325bf2f5f9871f90.tar.gz kernel-qcow2-linux-97e17d0e7bb861c197e50433325bf2f5f9871f90.tar.xz kernel-qcow2-linux-97e17d0e7bb861c197e50433325bf2f5f9871f90.zip | |
staging: brcm80211: remove osl_malloced()/MALLOCED()
because there are other means to track memory leaks in kernel
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/util')
| -rw-r--r-- | drivers/staging/brcm80211/util/hnddma.c | 7 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/util/linux_osl.c | 6 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/util/nicpci.c | 3 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/util/siutils.c | 3 |
4 files changed, 5 insertions, 14 deletions
diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c index 6f26abc196be..1c9e598321d3 100644 --- a/drivers/staging/brcm80211/util/hnddma.c +++ b/drivers/staging/brcm80211/util/hnddma.c @@ -381,8 +381,7 @@ hnddma_t *dma_attach(osl_t *osh, char *name, si_t *sih, void *dmaregstx, di = MALLOC(osh, sizeof(dma_info_t)); if (di == NULL) { #ifdef BCMDBG - printf("dma_attach: out of memory, malloced %d bytes\n", - MALLOCED(osh)); + printf("dma_attach: out of memory\n"); #endif return NULL; } @@ -517,7 +516,7 @@ hnddma_t *dma_attach(osl_t *osh, char *name, si_t *sih, void *dmaregstx, size = ntxd * sizeof(void *); di->txp = MALLOC(osh, size); if (di->txp == NULL) { - DMA_ERROR(("%s: dma_attach: out of tx memory, malloced %d bytes\n", di->name, MALLOCED(osh))); + DMA_ERROR(("%s: dma_attach: out of tx memory\n", di->name)); goto fail; } bzero((char *)di->txp, size); @@ -528,7 +527,7 @@ hnddma_t *dma_attach(osl_t *osh, char *name, si_t *sih, void *dmaregstx, size = nrxd * sizeof(void *); di->rxp = MALLOC(osh, size); if (di->rxp == NULL) { - DMA_ERROR(("%s: dma_attach: out of rx memory, malloced %d bytes\n", di->name, MALLOCED(osh))); + DMA_ERROR(("%s: dma_attach: out of rx memory\n", di->name)); goto fail; } bzero((char *)di->rxp, size); diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c index 7c7d14bc1c28..92012bc12668 100644 --- a/drivers/staging/brcm80211/util/linux_osl.c +++ b/drivers/staging/brcm80211/util/linux_osl.c @@ -314,12 +314,6 @@ void osl_mfree(osl_t *osh, void *addr, uint size) kfree(addr); } -uint osl_malloced(osl_t *osh) -{ - ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); - return osh->malloced; -} - uint osl_dma_consistent_align(void) { return PAGE_SIZE; diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/util/nicpci.c index 3a73c826d1ef..c48468df324b 100644 --- a/drivers/staging/brcm80211/util/nicpci.c +++ b/drivers/staging/brcm80211/util/nicpci.c @@ -117,8 +117,7 @@ void *pcicore_init(si_t *sih, osl_t *osh, void *regs) /* alloc pcicore_info_t */ pi = MALLOC(osh, sizeof(pcicore_info_t)); if (pi == NULL) { - PCI_ERROR(("pci_attach: malloc failed! malloced %d bytes\n", - MALLOCED(osh))); + PCI_ERROR(("pci_attach: malloc failed!\n")); return NULL; } diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c index ad74552870d0..1c563b065928 100644 --- a/drivers/staging/brcm80211/util/siutils.c +++ b/drivers/staging/brcm80211/util/siutils.c @@ -90,8 +90,7 @@ si_t *si_attach(uint devid, osl_t *osh, void *regs, uint bustype, void *sdh, /* alloc si_info_t */ sii = MALLOC(osh, sizeof(si_info_t)); if (sii == NULL) { - SI_ERROR(("si_attach: malloc failed! malloced %d bytes\n", - MALLOCED(osh))); + SI_ERROR(("si_attach: malloc failed!\n")); return NULL; } |