diff options
author | Arend van Spriel | 2011-10-05 15:20:12 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2011-10-05 22:42:51 +0200 |
commit | 5d3e78eeebb4143a0b5bd53547eb16968f43b5bc (patch) | |
tree | abf19f9ff0acf086a551c95543f4b371d5984436 /drivers/staging/brcm80211/brcmsmac/phy | |
parent | staging: brcm80211: remove parameter 'off' from _initvars_srom_pci() (diff) | |
download | kernel-qcow2-linux-5d3e78eeebb4143a0b5bd53547eb16968f43b5bc.tar.gz kernel-qcow2-linux-5d3e78eeebb4143a0b5bd53547eb16968f43b5bc.tar.xz kernel-qcow2-linux-5d3e78eeebb4143a0b5bd53547eb16968f43b5bc.zip |
staging: brcm80211: cleanup driver variable references
Throughout the data structures within the driver several references
to the driver variables were stored. As the storage and access
functions are now consolidated into srom.c those references are
no longer needed and have been removed.
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@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/brcmsmac/phy')
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_int.h | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c index 59767e36735c..d54cfdb0a8e1 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c @@ -459,7 +459,7 @@ static u32 wlc_phy_get_radio_ver(struct brcms_phy *pi) struct brcms_phy_pub * wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs, - int bandtype, char *vars, struct wiphy *wiphy) + int bandtype, struct wiphy *wiphy) { struct brcms_phy *pi; u32 sflags = 0; @@ -493,8 +493,6 @@ wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs, pi->phy_init_por = true; pi->phy_wreg_limit = PHY_WREG_LIMIT; - pi->vars = vars; - pi->txpwr_percent = 100; pi->do_initcal = true; @@ -609,8 +607,6 @@ wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs, pi->next = pi->sh->phy_head; sh->phy_head = pi; - pi->vars = (char *)&pi->vars; - memcpy(&pi->pubpi_ro, &pi->pubpi, sizeof(struct brcms_phy_pub)); return &pi->pubpi_ro; diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h b/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h index 44818af3047e..96e15163222b 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h @@ -167,7 +167,6 @@ struct shared_phy_params { uint unit; uint corerev; uint buscorerev; - char *vars; u16 vid; u16 did; uint chip; @@ -185,8 +184,7 @@ struct shared_phy_params { extern struct shared_phy *wlc_phy_shared_attach(struct shared_phy_params *shp); extern struct brcms_phy_pub *wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs, - int bandtype, char *vars, - struct wiphy *wiphy); + int bandtype, struct wiphy *wiphy); extern void wlc_phy_detach(struct brcms_phy_pub *ppi); extern bool wlc_phy_get_phyversion(struct brcms_phy_pub *pih, u16 *phytype, diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h b/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h index 4330e3846d9c..bea85241a244 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h @@ -561,7 +561,6 @@ struct brcms_phy { struct d11regs __iomem *regs; struct brcms_phy *next; - char *vars; struct brcms_phy_pub pubpi; bool do_initcal; |