Skip to content

Commit

Permalink
staging: brcm80211: remove volatile keyword from driver sources
Browse files Browse the repository at this point in the history
As checkpatch.pl rightfully indicated the volatile keyword was used
but not necessary. It has been removed from the code.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent 4b616d8 commit a918137
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions drivers/staging/brcm80211/brcmsmac/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2017,11 +2017,11 @@ static void brcms_c_write_inits(struct brcms_hardware *wlc_hw,
const struct d11init *inits)
{
int i;
volatile u8 *base;
u8 *base;

BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);

base = (volatile u8 *)wlc_hw->regs;
base = (u8 *)wlc_hw->regs;

for (i = 0; inits[i].addr != 0xffff; i++) {
if (inits[i].size == 2)
Expand Down Expand Up @@ -2822,8 +2822,8 @@ static u16
brcms_b_read_objmem(struct brcms_hardware *wlc_hw, uint offset, u32 sel)
{
struct d11regs *regs = wlc_hw->regs;
volatile u16 *objdata_lo = (volatile u16 *)&regs->objdata;
volatile u16 *objdata_hi = objdata_lo + 1;
u16 *objdata_lo = (u16 *)&regs->objdata;
u16 *objdata_hi = objdata_lo + 1;
u16 v;

W_REG(&regs->objaddr, sel | (offset >> 2));
Expand All @@ -2842,8 +2842,8 @@ brcms_b_write_objmem(struct brcms_hardware *wlc_hw, uint offset, u16 v,
u32 sel)
{
struct d11regs *regs = wlc_hw->regs;
volatile u16 *objdata_lo = (volatile u16 *)&regs->objdata;
volatile u16 *objdata_hi = objdata_lo + 1;
u16 *objdata_lo = (u16 *)&regs->objdata;
u16 *objdata_hi = objdata_lo + 1;

W_REG(&regs->objaddr, sel | (offset >> 2));
(void)R_REG(&regs->objaddr);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ void wlc_radioreg_enter(struct brcms_phy_pub *pih)
void wlc_radioreg_exit(struct brcms_phy_pub *pih)
{
struct brcms_phy *pi = (struct brcms_phy *) pih;
volatile u16 dummy;
u16 dummy;

dummy = R_REG(&pi->regs->phyversion);
pi->phy_wreg = 0;
Expand Down

0 comments on commit a918137

Please sign in to comment.