Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8da4a3a0 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed struct osl_info usage from fullmac driver 



Several occurrences in fullmac using struct osl_info could be removed.

Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Reviewed-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 377c8981

drivers/staging/brcm80211/brcmfmac/bcmsdbus.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ typedef void (*sdioh_cb_fn_t) (void *); 
 *  cfghdl points to the starting address of pci device mapped memory

 */

extern sdioh_info_t *sdioh_attach(struct osl_info *osh, void *cfghdl, uint irq);

extern SDIOH_API_RC sdioh_detach(struct osl_info *osh, sdioh_info_t *si);

extern SDIOH_API_RC sdioh_detach(sdioh_info_t *si);

extern SDIOH_API_RC sdioh_interrupt_register(sdioh_info_t *si,

					     sdioh_cb_fn_t fn, void *argh);

extern SDIOH_API_RC sdioh_interrupt_deregister(sdioh_info_t *si);

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ bcmsdh_info_t *bcmsdh_attach(struct osl_info *osh, void *cfghdl, 


	bcmsdh->sdioh = sdioh_attach(osh, cfghdl, irq);

	if (!bcmsdh->sdioh) {

		bcmsdh_detach(osh, bcmsdh);

		bcmsdh_detach(bcmsdh);

		return NULL;

	}
@@ -85,13 +85,13 @@ bcmsdh_info_t *bcmsdh_attach(struct osl_info *osh, void *cfghdl, 
	return bcmsdh;

}



int bcmsdh_detach(struct osl_info *osh, void *sdh)

int bcmsdh_detach(void *sdh)

{

	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;



	if (bcmsdh != NULL) {

		if (bcmsdh->sdioh) {

			sdioh_detach(osh, bcmsdh->sdioh);

			sdioh_detach(bcmsdh->sdioh);

			bcmsdh->sdioh = NULL;

		}

		kfree(bcmsdh);

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ int bcmsdh_probe(struct device *dev) 
err:

	if (sdhc) {

		if (sdhc->sdh)

			bcmsdh_detach(sdhc->osh, sdhc->sdh);

			bcmsdh_detach(sdhc->sdh);

		kfree(sdhc);

	}

	if (osh)
@@ -250,7 +250,7 @@ int bcmsdh_remove(struct device *dev) 


	sdhc = sdhcinfo;

	drvinfo.detach(sdhc->ch);

	bcmsdh_detach(sdhc->osh, sdhc->sdh);

	bcmsdh_detach(sdhc->sdh);

	/* find the SDIO Host Controller state for this pdev

		 and take it out from the list */

	for (sdhc = sdhcinfo, prev = NULL; sdhc; sdhc = sdhc->next) {

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ extern sdioh_info_t *sdioh_attach(struct osl_info *osh, void *bar0, uint irq) 
	return sd;

}



extern SDIOH_API_RC sdioh_detach(struct osl_info *osh, sdioh_info_t *sd)

extern SDIOH_API_RC sdioh_detach(sdioh_info_t *sd)

{

	sd_trace(("%s\n", __func__));

drivers/staging/brcm80211/brcmfmac/dhd_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ extern void dhd_bus_unregister(void); 


/* Download firmware image and nvram image */

extern bool dhd_bus_download_firmware(struct dhd_bus *bus,

	      struct osl_info *osh, char *fw_path, char *nv_path);

				      char *fw_path, char *nv_path);



/* Stop bus module: clear pending frames, disable data flow */

extern void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex);