diff options
author | Anish Bhatt <anish@gatech.edu> | 2015-10-13 04:02:36 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-13 17:32:40 (GMT) |
commit | 56b3152e5e8b0501ff9ef100b772df8ecb3efd82 (patch) | |
tree | f54bfa48aecec55a0c8476c33d3dba6c1839f283 /drivers/staging/rtl8192u/r8192U_core.c | |
parent | eb36cc282a9d9cc6c024010e7b65e88d1b088c54 (diff) | |
download | linux-56b3152e5e8b0501ff9ef100b772df8ecb3efd82.tar.xz |
rtl8192u: BIT() macro cleanup
Use the BIT(x) macro directly instead using multiple
BITX defines.
Signed-off-by: Anish Bhatt <anish@gatech.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8192u/r8192U_core.c')
-rw-r--r-- | drivers/staging/rtl8192u/r8192U_core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index eab0d81..678ecf6 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -233,7 +233,7 @@ static void CamResetAllEntry(struct net_device *dev) * condition, Cam can not be reset because upper layer will not set * this static key again. */ - ulcommand |= BIT31 | BIT30; + ulcommand |= BIT(31) | BIT(30); write_nic_dword(dev, RWCAM, ulcommand); } @@ -242,7 +242,7 @@ static void CamResetAllEntry(struct net_device *dev) void write_cam(struct net_device *dev, u8 addr, u32 data) { write_nic_dword(dev, WCAMI, data); - write_nic_dword(dev, RWCAM, BIT31 | BIT16 | (addr & 0xff)); + write_nic_dword(dev, RWCAM, BIT(31) | BIT(16) | (addr & 0xff)); } u32 read_cam(struct net_device *dev, u8 addr) @@ -2412,7 +2412,7 @@ static void rtl8192_get_eeprom_size(struct net_device *dev) read_nic_word_E(dev, EPROM_CMD, &curCR); RT_TRACE(COMP_EPROM, "read from Reg EPROM_CMD(%x):%x\n", EPROM_CMD, curCR); - /* whether need I consider BIT5? */ + /* whether need I consider BIT(5?) */ priv->epromtype = (curCR & Cmd9346CR_9356SEL) ? EPROM_93c56 : EPROM_93c46; RT_TRACE(COMP_EPROM, @@ -5180,14 +5180,14 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, dev, EntryNo, KeyIndex, KeyType, MacAddr); if (DefaultKey) - usConfig |= BIT15 | (KeyType << 2); + usConfig |= BIT(15) | (KeyType << 2); else - usConfig |= BIT15 | (KeyType << 2) | KeyIndex; + usConfig |= BIT(15) | (KeyType << 2) | KeyIndex; for (i = 0; i < CAM_CONTENT_COUNT; i++) { TargetCommand = i + CAM_CONTENT_COUNT * EntryNo; - TargetCommand |= BIT31 | BIT16; + TargetCommand |= BIT(31) | BIT(16); if (i == 0) { /* MAC|Config */ TargetContent = (u32)(*(MacAddr + 0)) << 16 | |