lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: brcm80211: remove volatile keyword from driver sources

Browse Source 
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>
This commit is contained in:
Arend van Spriel
2011-08-08 15:58:05 +02:00
committed by Greg Kroah-Hartman
parent 4b616d81ba
commit a918137ab5
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/brcm80211/brcmsmac/main.c
View File

@@ -2017,11 +2017,11 @@ static void brcms_c_write_inits(struct brcms_hardware *wlc_hw,
const struct d11init *inits) const struct d11init *inits)
{ {
int i; int i;
volatile u8 *base; u8 *base;
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); 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++) { for (i = 0; inits[i].addr != 0xffff; i++) {
if (inits[i].size == 2) if (inits[i].size == 2)
@@ -2822,8 +2822,8 @@ static u16
brcms_b_read_objmem(struct brcms_hardware *wlc_hw, uint offset, u32 sel) brcms_b_read_objmem(struct brcms_hardware *wlc_hw, uint offset, u32 sel)
{ {
struct d11regs *regs = wlc_hw->regs; struct d11regs *regs = wlc_hw->regs;
volatile u16 *objdata_lo = (volatile u16 *)&regs->objdata; u16 *objdata_lo = (u16 *)&regs->objdata;
volatile u16 *objdata_hi = objdata_lo + 1; u16 *objdata_hi = objdata_lo + 1;
u16 v; u16 v;
W_REG(&regs->objaddr, sel | (offset >> 2)); W_REG(&regs->objaddr, sel | (offset >> 2));
@@ -2842,8 +2842,8 @@ brcms_b_write_objmem(struct brcms_hardware *wlc_hw, uint offset, u16 v,
u32 sel) u32 sel)
{ {
struct d11regs *regs = wlc_hw->regs; struct d11regs *regs = wlc_hw->regs;
volatile u16 *objdata_lo = (volatile u16 *)&regs->objdata; u16 *objdata_lo = (u16 *)&regs->objdata;
volatile u16 *objdata_hi = objdata_lo + 1; u16 *objdata_hi = objdata_lo + 1;
W_REG(&regs->objaddr, sel | (offset >> 2)); W_REG(&regs->objaddr, sel | (offset >> 2));
(void)R_REG(&regs->objaddr); (void)R_REG(&regs->objaddr);

2
drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
View File

@@ -205,7 +205,7 @@ void wlc_radioreg_enter(struct brcms_phy_pub *pih)
void wlc_radioreg_exit(struct brcms_phy_pub *pih) void wlc_radioreg_exit(struct brcms_phy_pub *pih)
{ {
struct brcms_phy *pi = (struct brcms_phy *) pih; struct brcms_phy *pi = (struct brcms_phy *) pih;
volatile u16 dummy; u16 dummy;
dummy = R_REG(&pi->regs->phyversion); dummy = R_REG(&pi->regs->phyversion);
pi->phy_wreg = 0; pi->phy_wreg = 0;