Commit 182acb3c authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: replace MFREE with kfree 



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

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+4 −4
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ int bcmsdh_probe(struct device *dev) 
	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 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	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 */

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}