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

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

staging: brcm80211: remove struct osl_info usage from phy sources 



Getting rid of osl concept taking small steps. This commit removes
it from source files in brcm80211/brcmsmac/phy directory.

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 810acd19

drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c

+0 −22
Original line number Diff line number Diff line
@@ -275,13 +275,9 @@ u16 read_radio_reg(phy_info_t *pi, u16 addr) 


void write_radio_reg(phy_info_t *pi, u16 addr, u16 val)

{

	struct osl_info *osh;



	if (NORADIO_ENAB(pi->pubpi))

		return;



	osh = pi->sh->osh;



	if ((D11REV_GE(pi->sh->corerev, 24)) ||

	    (D11REV_IS(pi->sh->corerev, 22)

	     && (pi->pubpi.phy_type != PHY_TYPE_SSN))) {
@@ -408,10 +404,8 @@ static bool wlc_phy_war41476(phy_info_t *pi) 


u16 read_phy_reg(phy_info_t *pi, u16 addr)

{

	struct osl_info *osh;

	d11regs_t *regs;



	osh = pi->sh->osh;

	regs = pi->regs;



	W_REG(&regs->phyregaddr, addr);
@@ -429,10 +423,8 @@ u16 read_phy_reg(phy_info_t *pi, u16 addr) 


void write_phy_reg(phy_info_t *pi, u16 addr, u16 val)

{

	struct osl_info *osh;

	d11regs_t *regs;



	osh = pi->sh->osh;

	regs = pi->regs;



#ifdef __mips__
@@ -455,10 +447,8 @@ void write_phy_reg(phy_info_t *pi, u16 addr, u16 val) 


void and_phy_reg(phy_info_t *pi, u16 addr, u16 val)

{

	struct osl_info *osh;

	d11regs_t *regs;



	osh = pi->sh->osh;

	regs = pi->regs;



	W_REG(&regs->phyregaddr, addr);
@@ -476,10 +466,8 @@ void and_phy_reg(phy_info_t *pi, u16 addr, u16 val) 


void or_phy_reg(phy_info_t *pi, u16 addr, u16 val)

{

	struct osl_info *osh;

	d11regs_t *regs;



	osh = pi->sh->osh;

	regs = pi->regs;



	W_REG(&regs->phyregaddr, addr);
@@ -497,10 +485,8 @@ void or_phy_reg(phy_info_t *pi, u16 addr, u16 val) 


void mod_phy_reg(phy_info_t *pi, u16 addr, u16 mask, u16 val)

{

	struct osl_info *osh;

	d11regs_t *regs;



	osh = pi->sh->osh;

	regs = pi->regs;



	W_REG(&regs->phyregaddr, addr);
@@ -563,7 +549,6 @@ shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp) 
		return NULL;

	}



	sh->osh = shp->osh;

	sh->sih = shp->sih;

	sh->physhim = shp->physhim;

	sh->unit = shp->unit;
@@ -594,11 +579,7 @@ shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp) 


void wlc_phy_shared_detach(shared_phy_t *phy_sh)

{

	struct osl_info *osh;



	if (phy_sh) {

		osh = phy_sh->osh;



		if (phy_sh->phy_head) {

			ASSERT(!phy_sh->phy_head);

		}
@@ -612,9 +593,6 @@ wlc_phy_t *wlc_phy_attach(shared_phy_t *sh, void *regs, int bandtype, char *vars 
	u32 sflags = 0;

	uint phyversion;

	int i;

	struct osl_info *osh;



	osh = sh->osh;



	if (D11REV_IS(sh->corerev, 4))

		sflags = SISF_2G_PHY | SISF_5G_PHY;

drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ struct phy_pub; 
typedef struct phy_pub wlc_phy_t;



typedef struct shared_phy_params {

	void *osh;

	si_t *sih;

	void *physhim;

	uint unit;

drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h

+0 −1
Original line number Diff line number Diff line
@@ -527,7 +527,6 @@ typedef struct { 
struct shared_phy {

	struct phy_info *phy_head;

	uint unit;

	struct osl_info *osh;

	si_t *sih;

	void *physhim;

	uint corerev;

drivers/staging/brcm80211/brcmsmac/wlc_bmac.c

+0 −1
Original line number Diff line number Diff line
@@ -805,7 +805,6 @@ int wlc_bmac_attach(struct wlc_info *wlc, u16 vendor, u16 device, uint unit, 
	}



	/* pass all the parameters to wlc_phy_shared_attach in one struct */

	sha_params.osh = wlc->osh;

	sha_params.sih = wlc_hw->sih;

	sha_params.physhim = wlc_hw->physhim;

	sha_params.unit = unit;