Commit 08db27dc authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: replaced typedef wlc_pub_t by struct wlc_pub 



Code cleanup

Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c41c858f

drivers/staging/brcm80211/sys/wl_mac80211.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct wl_firmware { 
};



struct wl_info {

	wlc_pub_t *pub;		/* pointer to public wlc state */

	struct wlc_pub *pub;		/* pointer to public wlc state */

	void *wlc;		/* pointer to private common os-independent data */

	struct osl_info *osh;		/* pointer to os handler */

	u32 magic;

drivers/staging/brcm80211/sys/wlc_alloc.c

+9 −9
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 
#include <wlc_alloc.h>

#include <wl_dbg.h>



static wlc_pub_t *wlc_pub_malloc(struct osl_info *osh, uint unit, uint *err,

				 uint devid);

static void wlc_pub_mfree(struct osl_info *osh, wlc_pub_t *pub);

static struct wlc_pub *wlc_pub_malloc(struct osl_info *osh, uint unit,

				      uint *err, uint devid);

static void wlc_pub_mfree(struct osl_info *osh, struct wlc_pub *pub);

static void wlc_tunables_init(wlc_tunables_t *tunables, uint devid);



void *wlc_calloc(struct osl_info *osh, uint unit, uint size)
@@ -65,12 +65,12 @@ void wlc_tunables_init(wlc_tunables_t *tunables, uint devid) 
	tunables->txsbnd = TXSBND;

}



static wlc_pub_t *wlc_pub_malloc(struct osl_info *osh, uint unit, uint *err,

				 uint devid)

static struct wlc_pub *wlc_pub_malloc(struct osl_info *osh, uint unit,

				      uint *err, uint devid)

{

	wlc_pub_t *pub;

	struct wlc_pub *pub;



	pub = (wlc_pub_t *) wlc_calloc(osh, unit, sizeof(wlc_pub_t));

	pub = (struct wlc_pub *) wlc_calloc(osh, unit, sizeof(struct wlc_pub));

	if (pub == NULL) {

		*err = 1001;

		goto fail;
@@ -100,7 +100,7 @@ static wlc_pub_t *wlc_pub_malloc(struct osl_info *osh, uint unit, uint *err, 
	return NULL;

}



static void wlc_pub_mfree(struct osl_info *osh, wlc_pub_t *pub)

static void wlc_pub_mfree(struct osl_info *osh, struct wlc_pub *pub)

{

	if (pub == NULL)

		return;
@@ -179,7 +179,7 @@ struct wlc_info *wlc_attach_malloc(struct osl_info *osh, uint unit, uint *err, 


	wlc->hwrxoff = WL_HWRXOFF;



	/* allocate wlc_pub_t state structure */

	/* allocate struct wlc_pub state structure */

	wlc->pub = wlc_pub_malloc(osh, unit, err, devid);

	if (wlc->pub == NULL) {

		*err = 1003;

drivers/staging/brcm80211/sys/wlc_antsel.c

+2 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ const u8 mimo_2x3_div_antselid_tbl[16] = { 


struct antsel_info *wlc_antsel_attach(struct wlc_info *wlc,

				      struct osl_info *osh,

						  wlc_pub_t *pub,

				      struct wlc_pub *pub,

				      struct wlc_hw_info *wlc_hw) {

	struct antsel_info *asi;

drivers/staging/brcm80211/sys/wlc_antsel.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define _wlc_antsel_h_

extern struct antsel_info *wlc_antsel_attach(struct wlc_info *wlc,

					struct osl_info *osh,

					wlc_pub_t *pub,

					struct wlc_pub *pub,

					struct wlc_hw_info *wlc_hw);

extern void wlc_antsel_detach(struct antsel_info *asi);

extern void wlc_antsel_init(struct antsel_info *asi);

drivers/staging/brcm80211/sys/wlc_channel.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ typedef struct wlc_cm_band { 
} wlc_cm_band_t;



struct wlc_cm_info {

	wlc_pub_t *pub;

	struct wlc_pub *pub;

	struct wlc_info *wlc;

	char srom_ccode[WLC_CNTRY_BUF_SZ];	/* Country Code in SROM */

	uint srom_regrev;	/* Regulatory Rev for the SROM ccode */
@@ -611,7 +611,7 @@ wlc_cm_info_t *wlc_channel_mgr_attach(struct wlc_info *wlc) 
	wlc_cm_info_t *wlc_cm;

	char country_abbrev[WLC_CNTRY_BUF_SZ];

	const country_info_t *country;

	wlc_pub_t *pub = wlc->pub;

	struct wlc_pub *pub = wlc->pub;

	char *ccode;



	WL_TRACE(("wl%d: wlc_channel_mgr_attach\n", wlc->pub->unit));