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>

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
index 35b43677d213b82e3ed7c3aa0683123ec50f721f..bb49a0cd0b08941268704a7a60f3c4536d965f2e 100644 (file)
--- 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(&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;

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h
index 514e15e002838c4cfa54bdc925094a0cd52b36bb..bf962d5b339af57fe9a40903c1038099ee96ab57 100644 (file)
--- 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 0530b1ddb3cad5c4e8dffe9b1f260d2999d4245f..6e12a95c736051de60b8f4604fc5f17d5ed0fe9d 100644 (file)
--- 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 6ec0ab79980201eefc39b988ff45f835ae39c732..ca12d2602799c08ba69beed8264f56454b0ccec8 100644 (file)
--- 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;