diff options
author | mike.rapoport@gmail.com <mike.rapoport@gmail.com> | 2010-10-13 00:09:12 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-14 12:29:56 -0700 |
commit | 182acb3ca59ba2d31485f7225177c069cebdc161 (patch) | |
tree | b0bd77c9c3c377d642c338bf825146f78a198b24 /drivers/staging/brcm80211/brcmfmac | |
parent | 199d217c52dcc961dfd5928e5cbc32cc8a9140d9 (diff) | |
download | op-kernel-dev-182acb3ca59ba2d31485f7225177c069cebdc161.zip op-kernel-dev-182acb3ca59ba2d31485f7225177c069cebdc161.tar.gz |
staging: brcm80211: replace MFREE with kfree
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 | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 8 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_common.c | 10 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 16 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 32 |
8 files changed, 40 insertions, 40 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 3cc979f..6b62478 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -92,7 +92,7 @@ int bcmsdh_detach(osl_t *osh, void *sdh) sdioh_detach(osh, bcmsdh->sdioh); bcmsdh->sdioh = NULL; } - MFREE(osh, bcmsdh, sizeof(bcmsdh_info_t)); + kfree(bcmsdh); } l_bcmsdh = NULL; @@ -328,7 +328,7 @@ int bcmsdh_cis_read(void *sdh, uint func, u8 * cis, uint length) if ((((tmp_ptr - tmp_buf) + 1) & 0xf) == 0) ptr += sprintf((char *)ptr, "\n"); } - MFREE(bcmsdh->osh, tmp_buf, length); + kfree(tmp_buf); } return SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR; diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index b24644e..2ed7cf2 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -246,7 +246,7 @@ err: if (sdhc) { if (sdhc->sdh) bcmsdh_detach(sdhc->osh, sdhc->sdh); - MFREE(osh, sdhc, sizeof(bcmsdh_hc_t)); + kfree(sdhc); } if (osh) osl_detach(osh); @@ -283,7 +283,7 @@ int bcmsdh_remove(struct device *dev) /* release SDIO Host Controller info */ osh = sdhc->osh; - MFREE(osh, sdhc, sizeof(bcmsdh_hc_t)); + kfree(sdhc); osl_detach(osh); #if !defined(BCMLXSDMMC) @@ -471,7 +471,7 @@ err: if (sdhc->sdh) bcmsdh_detach(sdhc->osh, sdhc->sdh); if (sdhc) - MFREE(osh, sdhc, sizeof(bcmsdh_hc_t)); + kfree(sdhc); if (osh) osl_detach(osh); return -ENODEV; @@ -506,7 +506,7 @@ static void __devexit bcmsdh_pci_remove(struct pci_dev *pdev) /* release SDIO Host Controller info */ osh = sdhc->osh; - MFREE(osh, sdhc, sizeof(bcmsdh_hc_t)); + kfree(sdhc); osl_detach(osh); } #endif /* BCMLXSDMMC */ diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index d6e699c..9adf37a 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -131,7 +131,7 @@ extern sdioh_info_t *sdioh_attach(osl_t *osh, void *bar0, uint irq) sd->osh = osh; if (sdioh_sdmmc_osinit(sd) != 0) { sd_err(("%s:sdioh_sdmmc_osinit() failed\n", __func__)); - MFREE(sd->osh, sd, sizeof(sdioh_info_t)); + kfree(sd); return NULL; } @@ -193,7 +193,7 @@ extern SDIOH_API_RC sdioh_detach(osl_t *osh, sdioh_info_t *sd) /* deregister irq */ sdioh_sdmmc_osfree(sd); - MFREE(sd->osh, sd, sizeof(sdioh_info_t)); + kfree(sd); } return SDIOH_API_RC_SUCCESS; } diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c index 7a80bcf..6ee2f48 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c @@ -164,7 +164,7 @@ void sdioh_sdmmc_osfree(sdioh_info_t *sd) ASSERT(sd && sd->sdos_info); sdos = (struct sdos_info *)sd->sdos_info; - MFREE(sd->osh, sdos, sizeof(struct sdos_info)); + kfree(sdos); } /* Interrupt enable/disable */ diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c index f1d550f..6bf321d 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c @@ -427,14 +427,14 @@ int dhd_prot_attach(dhd_pub_t *dhd) fail: if (cdc != NULL) - MFREE(dhd->osh, cdc, sizeof(dhd_prot_t)); + kfree(cdc); return BCME_NOMEM; } /* ~NOTE~ What if another thread is waiting on the semaphore? Holding it? */ void dhd_prot_detach(dhd_pub_t *dhd) { - MFREE(dhd->osh, dhd->prot, sizeof(dhd_prot_t)); + kfree(dhd->prot); dhd->prot = NULL; } diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index 66b4c7d..f0155e0 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -1052,7 +1052,7 @@ dhd_pktfilter_offload_enable(dhd_pub_t *dhd, char *arg, int enable, fail: if (arg_org) - MFREE(dhd->osh, arg_org, strlen(arg) + 1); + kfree(arg_org); } void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg) @@ -1188,10 +1188,10 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg) fail: if (arg_org) - MFREE(dhd->osh, arg_org, strlen(arg) + 1); + kfree(arg_org); if (buf) - MFREE(dhd->osh, buf, BUF_SIZE); + kfree(buf); } void dhd_arp_offload_set(dhd_pub_t *dhd, int arp_mode) @@ -1406,7 +1406,7 @@ void dhd_iscan_free_buf(void *dhdp, iscan_buf_t *iscan_delete) iscanbuf_free = iscanbuf_cur; iscanbuf_cur = iscanbuf_cur->next; iscanbuf_free->next = 0; - MFREE(dhd->osh, iscanbuf_free, sizeof(iscan_buf_t)); + kfree(iscanbuf_free); } iscan_chain = 0; } else { @@ -1420,7 +1420,7 @@ void dhd_iscan_free_buf(void *dhdp, iscan_buf_t *iscan_delete) iscanbuf_prv->next = iscan_delete->next; iscan_delete->next = 0; - MFREE(dhd->osh, iscan_delete, sizeof(iscan_buf_t)); + kfree(iscan_delete); if (!iscanbuf_prv) iscan_chain = 0; diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index e37ed4b..a3e9ca8 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -747,7 +747,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx) allmulti = cnt ? true : allmulti; } - MFREE(dhd->pub.osh, buf, buflen); + kfree(buf); /* Now send the allmulti setting. This is based on the setting in the * net_device flags, but might be modified above to be turned on if we @@ -768,7 +768,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx) DHD_ERROR(("%s: mkiovar failed for allmulti, datalen %d " "buflen %u\n", dhd_ifname(&dhd->pub, ifidx), (int)sizeof(allmulti), buflen)); - MFREE(dhd->pub.osh, buf, buflen); + kfree(buf); return; } @@ -784,7 +784,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx) dhd_ifname(&dhd->pub, ifidx), ltoh32(allmulti))); } - MFREE(dhd->pub.osh, buf, buflen); + kfree(buf); /* Finally, pick up the PROMISC flag as well, like the NIC driver does */ @@ -921,7 +921,7 @@ static void dhd_op_if(dhd_if_t *ifp) free_netdev(ifp->net); dhd->iflist[ifp->idx] = NULL; - MFREE(dhd->pub.osh, ifp, sizeof(*ifp)); + kfree(ifp); #ifdef SOFTAP if (ifp->net == ap_net_dev) ap_net_dev = NULL; /* NULL SOFTAP global @@ -1746,7 +1746,7 @@ done: } if (buf) - MFREE(dhd->pub.osh, buf, buflen); + kfree(buf); return OSL_ERROR(bcmerror); } @@ -2374,8 +2374,8 @@ void dhd_detach(dhd_pub_t *dhdp) WAKE_LOCK_DESTROY(dhdp, WAKE_LOCK_LINK_DOWN_TMOUT); WAKE_LOCK_DESTROY(dhdp, WAKE_LOCK_PNO_FIND_TMOUT); free_netdev(ifp->net); - MFREE(dhd->pub.osh, ifp, sizeof(*ifp)); - MFREE(dhd->pub.osh, dhd, sizeof(*dhd)); + kfree(ifp); + kfree(dhd); } } } @@ -2923,7 +2923,7 @@ int write_to_file(dhd_pub_t *dhd, u8 *buf, int size) exit: /* free buf before return */ - MFREE(dhd->osh, buf, size); + kfree(buf); /* close file before return */ if (fp) filp_close(fp, current->files); diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 18bc396..e3ef1a7 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -1927,9 +1927,9 @@ static int dhdsdio_checkdied(dhd_bus_t *bus, u8 *data, uint size) done: if (mbuffer) - MFREE(bus->dhd->osh, mbuffer, msize); + kfree(mbuffer); if (str) - MFREE(bus->dhd->osh, str, maxstrlen); + kfree(str); return bcmerror; } @@ -1959,7 +1959,7 @@ static int dhdsdio_mem_dump(dhd_bus_t *bus) if (ret) { printf("%s: Error membytes %d\n", __func__, ret); if (buf) - MFREE(bus->dhd->osh, buf, size); + kfree(buf); return -1; } printf("."); @@ -2078,7 +2078,7 @@ int dhdsdio_downloadvars(dhd_bus_t *bus, void *arg, int len) /* Free the old ones and replace with passed variables */ if (bus->vars) - MFREE(bus->dhd->osh, bus->vars, bus->varsz); + kfree(bus->vars); bus->vars = kmalloc(len, GFP_ATOMIC); bus->varsz = bus->vars ? len : 0; @@ -2562,10 +2562,10 @@ static int dhdsdio_write_vars(dhd_bus_t *bus) DHD_ERROR(("%s: Download/Upload/Compare of NVRAM ok.\n", __func__)); - MFREE(bus->dhd->osh, nvram_ularray, varsize); + kfree(nvram_ularray); #endif /* DHD_DEBUG */ - MFREE(bus->dhd->osh, vbuffer, varsize); + kfree(vbuffer); } /* adjust to the user specified RAM */ @@ -5286,7 +5286,7 @@ dhdsdio_probe_attach(struct dhd_bus *bus, osl_t *osh, void *sdh, void *regsva, if (err) { DHD_INFO(("dhdsdio_probe: fn %d cis read " "err %d\n", fn, err)); - MFREE(osh, cis[fn], SBSDIO_CIS_SIZE_LIMIT); + kfree(cis[fn]); break; } dhd_dump_cis(fn, cis[fn]); @@ -5294,7 +5294,7 @@ dhdsdio_probe_attach(struct dhd_bus *bus, osl_t *osh, void *sdh, void *regsva, while (fn-- > 0) { ASSERT(cis[fn]); - MFREE(osh, cis[fn], SBSDIO_CIS_SIZE_LIMIT); + kfree(cis[fn]); } if (err) { @@ -5400,7 +5400,7 @@ static bool dhdsdio_probe_malloc(dhd_bus_t *bus, osl_t *osh, void *sdh) __func__, MAX_DATA_BUF)); /* release rxbuf which was already located as above */ if (!bus->rxblen) - MFREE(osh, bus->rxbuf, bus->rxblen); + kfree(bus->rxbuf); goto fail; } @@ -5544,7 +5544,7 @@ static void dhdsdio_release(dhd_bus_t *bus, osl_t *osh) dhdsdio_release_malloc(bus, osh); - MFREE(osh, bus, sizeof(dhd_bus_t)); + kfree(bus); } if (osh) @@ -5561,13 +5561,13 @@ static void dhdsdio_release_malloc(dhd_bus_t *bus, osl_t *osh) return; if (bus->rxbuf) { - MFREE(osh, bus->rxbuf, bus->rxblen); + kfree(bus->rxbuf); bus->rxctl = bus->rxbuf = NULL; bus->rxlen = 0; } if (bus->databuf) { - MFREE(osh, bus->databuf, MAX_DATA_BUF); + kfree(bus->databuf); bus->databuf = NULL; } } @@ -5587,7 +5587,7 @@ static void dhdsdio_release_dongle(dhd_bus_t *bus, osl_t *osh) dhdsdio_clkctl(bus, CLK_NONE, false); si_detach(bus->sih); if (bus->vars && bus->varsz) - MFREE(osh, bus->vars, bus->varsz); + kfree(bus->vars); bus->vars = NULL; } @@ -5710,7 +5710,7 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus) DHD_ERROR(("%s: Download/Upload/Compare succeeded.\n", __func__)); - MFREE(bus->dhd->osh, ularray, bus->ramsize); + kfree(ularray); } #endif /* DHD_DEBUG */ @@ -5758,7 +5758,7 @@ static int dhdsdio_download_code_file(struct dhd_bus *bus, char *fw_path) err: if (memblock) - MFREE(bus->dhd->osh, memblock, MEMBLOCK + DHD_SDALIGN); + kfree(memblock); if (image) dhd_os_close_image(image); @@ -5898,7 +5898,7 @@ static int dhdsdio_download_nvram(struct dhd_bus *bus) err: if (memblock) - MFREE(bus->dhd->osh, memblock, MEMBLOCK); + kfree(memblock); if (image) dhd_os_close_image(image); |