staging: brcm80211: remove volatile keyword from driver sources

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>

diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index d5f570a37624b3ca80f47ac7fc48b000b5ed28df..a49379580af7574e78224c485358cad7d81a2fec 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/drivers/staging/brcm80211/brcmsmac/main.c
@@ -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)
@@ -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));
@@ -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);

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
index 940f76ba7787488deb7febf7a435f075bd56609a..c6c52870dfe88acc3170e428eba765c91df6ee85 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -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;