diff options
| author | Arend van Spriel <arend@broadcom.com> | 2011-03-02 21:18:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-02 19:48:02 -0500 |
| commit | 5508d82488694e3d427345d624687a3fa9fb9a88 (patch) | |
| tree | 882458703376a17bb371c00b7ed7a9eb245af364 /drivers/staging/brcm80211 | |
| parent | 810acd19a4cd1e29d910f8a7eea8bcc168de00cd (diff) | |
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: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211')
4 files changed, 0 insertions, 25 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c index 35b43677d213..bb49a0cd0b08 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c @@ -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(®s->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(®s->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(®s->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(®s->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; diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h index 514e15e00283..bf962d5b339a 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h @@ -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; diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h index 0530b1ddb3ca..6e12a95c7360 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h @@ -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; diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c index 6ec0ab799802..ca12d2602799 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c @@ -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; |