Commit e69284f2 authored by Brett Rudley's avatar Brett Rudley Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: s/osl_t/struct osl_info/g 



Do the substitution (and then fix all the dang lines that were pushed past 80 columns.)

Some of the touched lines triggered checkpatch warnings for completely unrelated
reasons that were already there. Those will have to be addressed later.

Signed-off-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e6a12a07

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+4 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct bcmsdh_info { 
	bool init_success;	/* underlying driver successfully attached */

	void *sdioh;		/* handler for sdioh */

	u32 vendevid;	/* Target Vendor and Device ID on SD bus */

	osl_t *osh;

	struct osl_info *osh;

	bool regfail;		/* Save status of last

				 reg_read/reg_write call */

	u32 sbwad;		/* Save backplane window address */
@@ -56,7 +56,8 @@ void bcmsdh_enable_hw_oob_intr(bcmsdh_info_t *sdh, bool enable) 
}

#endif



bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq)

bcmsdh_info_t *bcmsdh_attach(struct osl_info *osh, void *cfghdl,

				void **regsva, uint irq)

{

	bcmsdh_info_t *bcmsdh;
@@ -85,7 +86,7 @@ bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq) 
	return bcmsdh;

}



int bcmsdh_detach(osl_t *osh, void *sdh)

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

{

	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+5 −5
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct bcmsdh_hc { 
#else

	struct pci_dev *dev;	/* pci device handle */

#endif				/* BCMPLATFORM_BUS */

	osl_t *osh;

	struct osl_info *osh;

	void *regs;		/* SDIO Host Controller address */

	bcmsdh_info_t *sdh;	/* SDIO Host Controller handle */

	void *ch;
@@ -142,7 +142,7 @@ static 
#endif				/* BCMLXSDMMC */

int bcmsdh_probe(struct device *dev)

{

	osl_t *osh = NULL;

	struct osl_info *osh = NULL;

	bcmsdh_hc_t *sdhc = NULL;

	unsigned long regs = 0;

	bcmsdh_info_t *sdh = NULL;
@@ -246,7 +246,7 @@ static 
int bcmsdh_remove(struct device *dev)

{

	bcmsdh_hc_t *sdhc, *prev;

	osl_t *osh;

	struct osl_info *osh;



	sdhc = sdhcinfo;

	drvinfo.detach(sdhc->ch);
@@ -339,7 +339,7 @@ module_param(sd_pci_slot, uint, 0); 
static int __devinit

bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	osl_t *osh = NULL;

	struct osl_info *osh = NULL;

	bcmsdh_hc_t *sdhc = NULL;

	unsigned long regs;

	bcmsdh_info_t *sdh = NULL;
@@ -470,7 +470,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
static void __devexit bcmsdh_pci_remove(struct pci_dev *pdev)

{

	bcmsdh_hc_t *sdhc, *prev;

	osl_t *osh;

	struct osl_info *osh;



	/* find the SDIO Host Controller state for this

		 pdev and take it out from the list */

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int sdioh_sdmmc_card_enablefuncs(sdioh_info_t *sd) 
/*

 *	Public entry points & extern's

 */

extern sdioh_info_t *sdioh_attach(osl_t *osh, void *bar0, uint irq)

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

{

	sdioh_info_t *sd;

	int err_ret;
@@ -175,7 +175,7 @@ extern sdioh_info_t *sdioh_attach(osl_t *osh, void *bar0, uint irq) 
	return sd;

}



extern SDIOH_API_RC sdioh_detach(osl_t *osh, sdioh_info_t *sd)

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

{

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

drivers/staging/brcm80211/brcmfmac/dhd.h

+5 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ enum dhd_prealloc_index { 
/* Common structure for module and instance linkage */

typedef struct dhd_pub {

	/* Linkage ponters */

	osl_t *osh;		/* OSL handle */

	struct osl_info *osh;		/* OSL handle */

	struct dhd_bus *bus;	/* Bus module handle */

	struct dhd_prot *prot;	/* Protocol module handle */

	struct dhd_info *info;	/* Info module handle */
@@ -277,15 +277,16 @@ typedef struct dhd_if_event { 
 */



/* To allow osl_attach/detach calls from os-independent modules */

osl_t *dhd_osl_attach(void *pdev, uint bustype);

void dhd_osl_detach(osl_t *osh);

struct osl_info *dhd_osl_attach(void *pdev, uint bustype);

void dhd_osl_detach(struct osl_info *osh);



/* Indication from bus module regarding presence/insertion of dongle.

 * Return dhd_pub_t pointer, used as handle to OS module in later calls.

 * Returned structure should have bus and prot pointers filled in.

 * bus_hdrlen specifies required headroom for bus module header.

 */

extern dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen);

extern dhd_pub_t *dhd_attach(struct osl_info *osh, struct dhd_bus *bus,

				uint bus_hdrlen);

extern int dhd_net_attach(dhd_pub_t *dhdp, int idx);



/* Indication from bus module regarding removal/absence of dongle */

drivers/staging/brcm80211/brcmfmac/dhd_bus.h

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ extern int dhd_bus_register(void); 
extern void dhd_bus_unregister(void);



/* Download firmware image and nvram image */

extern bool dhd_bus_download_firmware(struct dhd_bus *bus, osl_t * osh,

				      char *fw_path, char *nv_path);

extern bool dhd_bus_download_firmware(struct dhd_bus *bus,

	      struct osl_info *osh, 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);