diff options
| author | mike.rapoport@gmail.com <mike.rapoport@gmail.com> | 2010-10-13 00:09:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-14 12:28:18 -0700 |
| commit | 97e17d0e7bb861c197e50433325bf2f5f9871f90 (patch) | |
| tree | 92846f9a34e565c759b29c1dca958ca965c98dba /drivers/staging/brcm80211/brcmfmac | |
| parent | 6a92fdf1b923fa5b6d6dd08a7bba80fb3d9e5eaf (diff) | |
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/brcmfmac')
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 3 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 6 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 3 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 3ea64a69dee..04d92d15e8e 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -60,8 +60,7 @@ bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq) bcmsdh = (bcmsdh_info_t *) MALLOC(osh, sizeof(bcmsdh_info_t)); if (bcmsdh == NULL) { - BCMSDH_ERROR(("bcmsdh_attach: out of memory, " - "malloced %d bytes\n", MALLOCED(osh))); + BCMSDH_ERROR(("bcmsdh_attach: out of memory")); return NULL; } bzero((char *)bcmsdh, sizeof(bcmsdh_info_t)); diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index 2582f3c665f..164a752bcc4 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -197,8 +197,7 @@ int bcmsdh_probe(struct device *dev) } sdhc = MALLOC(osh, sizeof(bcmsdh_hc_t)); if (!sdhc) { - SDLX_MSG(("%s: out of memory, allocated %d bytes\n", - __func__, MALLOCED(osh))); + SDLX_MSG(("%s: out of memory\n", __func__)); goto err; } bzero(sdhc, sizeof(bcmsdh_hc_t)); @@ -430,8 +429,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } sdhc = MALLOC(osh, sizeof(bcmsdh_hc_t)); if (!sdhc) { - SDLX_MSG(("%s: out of memory, allocated %d bytes\n", - __func__, MALLOCED(osh))); + SDLX_MSG(("%s: out of memory\n", __func__)); goto err; } bzero(sdhc, sizeof(bcmsdh_hc_t)); diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index caabf7b563a..22c1e771453 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -125,8 +125,7 @@ extern sdioh_info_t *sdioh_attach(osl_t *osh, void *bar0, uint irq) sd = (sdioh_info_t *) MALLOC(osh, sizeof(sdioh_info_t)); if (sd == NULL) { - sd_err(("sdioh_attach: out of memory, malloced %d bytes\n", - MALLOCED(osh))); + sd_err(("sdioh_attach: out of memory\n")); return NULL; } bzero((char *)sd, sizeof(sdioh_info_t)); diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 9110fbe4f7f..20a90b2ab66 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -1827,10 +1827,6 @@ osl_t *dhd_osl_attach(void *pdev, uint bustype) void dhd_osl_detach(osl_t *osh) { - if (MALLOCED(osh)) { - DHD_ERROR(("%s: MEMORY LEAK %d bytes\n", __func__, - MALLOCED(osh))); - } osl_detach(osh); } |