Commit 5fcc1fcb authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: replace MALLOC() with k[zm]alloc 



Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 97e17d0e

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+2 −3
Original line number Diff line number Diff line
@@ -58,12 +58,11 @@ bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq) 
{

	bcmsdh_info_t *bcmsdh;



	bcmsdh = (bcmsdh_info_t *) MALLOC(osh, sizeof(bcmsdh_info_t));

	bcmsdh = kzalloc(sizeof(bcmsdh_info_t), GFP_ATOMIC);

	if (bcmsdh == NULL) {

		BCMSDH_ERROR(("bcmsdh_attach: out of memory"));

		return NULL;

	}

	bzero((char *)bcmsdh, sizeof(bcmsdh_info_t));



	/* save the handler locally */

	l_bcmsdh = bcmsdh;
@@ -317,7 +316,7 @@ int bcmsdh_cis_read(void *sdh, uint func, u8 * cis, uint length) 
	if (ascii) {

		/* Move binary bits to tmp and format them

			 into the provided buffer. */

		tmp_buf = (u8 *) MALLOC(bcmsdh->osh, length);

		tmp_buf = kmalloc(length, GFP_ATOMIC);

		if (tmp_buf == NULL) {

			BCMSDH_ERROR(("%s: out of memory\n", __func__));

			return BCME_NOMEM;

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+2 −4
Original line number Diff line number Diff line
@@ -195,12 +195,11 @@ int bcmsdh_probe(struct device *dev) 
		SDLX_MSG(("%s: osl_attach failed\n", __func__));

		goto err;

	}

	sdhc = MALLOC(osh, sizeof(bcmsdh_hc_t));

	sdhc = kzalloc(sizeof(bcmsdh_hc_t), GFP_ATOMIC);

	if (!sdhc) {

		SDLX_MSG(("%s: out of memory\n", __func__));

		goto err;

	}

	bzero(sdhc, sizeof(bcmsdh_hc_t));

	sdhc->osh = osh;



	sdhc->dev = (void *)dev;
@@ -427,12 +426,11 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		SDLX_MSG(("%s: osl_attach failed\n", __func__));

		goto err;

	}

	sdhc = MALLOC(osh, sizeof(bcmsdh_hc_t));

	sdhc = kzalloc(sizeof(bcmsdh_hc_t), GFP_ATOMIC);

	if (!sdhc) {

		SDLX_MSG(("%s: out of memory\n", __func__));

		goto err;

	}

	bzero(sdhc, sizeof(bcmsdh_hc_t));

	sdhc->osh = osh;



	sdhc->dev = pdev;

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+1 −2
Original line number Diff line number Diff line
@@ -123,12 +123,11 @@ extern sdioh_info_t *sdioh_attach(osl_t *osh, void *bar0, uint irq) 
		return NULL;

	}



	sd = (sdioh_info_t *) MALLOC(osh, sizeof(sdioh_info_t));

	sd = kzalloc(sizeof(sdioh_info_t), GFP_ATOMIC);

	if (sd == NULL) {

		sd_err(("sdioh_attach: out of memory\n"));

		return NULL;

	}

	bzero((char *)sd, sizeof(sdioh_info_t));

	sd->osh = osh;

	if (sdioh_sdmmc_osinit(sd) != 0) {

		sd_err(("%s:sdioh_sdmmc_osinit() failed\n", __func__));

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int sdioh_sdmmc_osinit(sdioh_info_t *sd) 
{

	struct sdos_info *sdos;



	sdos = (struct sdos_info *)MALLOC(sd->osh, sizeof(struct sdos_info));

	sdos = kmalloc(sizeof(struct sdos_info), GFP_ATOMIC);

	sd->sdos_info = (void *)sdos;

	if (sdos == NULL)

		return BCME_NOMEM;

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+1 −2
Original line number Diff line number Diff line
@@ -406,12 +406,11 @@ int dhd_prot_attach(dhd_pub_t *dhd) 
{

	dhd_prot_t *cdc;



	cdc = (dhd_prot_t *) MALLOC(dhd->osh, sizeof(dhd_prot_t));

	cdc = kzalloc(sizeof(dhd_prot_t), GFP_ATOMIC);

	if (!cdc) {

		DHD_ERROR(("%s: kmalloc failed\n", __func__));

		goto fail;

	}

	memset(cdc, 0, sizeof(dhd_prot_t));



	/* ensure that the msg buf directly follows the cdc msg struct */

	if ((uintptr) (&cdc->msg + 1) != (uintptr) cdc->buf) {