tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

rtlwifi: rtl8192ce: rtl8192c_com: Remove usage of private bit manipulation macros

Besides the previously changes macros for the RX and TX descriptors.
the local macros are used in other places. These are replaced with
standard bit manipulation macros.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

authored by

Larry Finger and committed by
Kalle Valo 4c8692d4 5ea5c93d

+21 -23
+9 -10
drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c
··· 8 8 #include "../base.h" 9 9 #include "../core.h" 10 10 11 - #define BT_RSSI_STATE_NORMAL_POWER BIT_OFFSET_LEN_MASK_32(0, 1) 12 - #define BT_RSSI_STATE_AMDPU_OFF BIT_OFFSET_LEN_MASK_32(1, 1) 13 - #define BT_RSSI_STATE_SPECIAL_LOW BIT_OFFSET_LEN_MASK_32(2, 1) 14 - #define BT_RSSI_STATE_BG_EDCA_LOW BIT_OFFSET_LEN_MASK_32(3, 1) 15 - #define BT_RSSI_STATE_TXPOWER_LOW BIT_OFFSET_LEN_MASK_32(4, 1) 11 + #define BT_RSSI_STATE_NORMAL_POWER BIT(0) 12 + #define BT_RSSI_STATE_AMDPU_OFF BIT(1) 13 + #define BT_RSSI_STATE_SPECIAL_LOW BIT(2) 14 + #define BT_RSSI_STATE_BG_EDCA_LOW BIT(3) 15 + #define BT_RSSI_STATE_TXPOWER_LOW BIT(4) 16 16 #define BT_MASK 0x00ffffff 17 17 18 18 #define RTLPRIV (struct rtl_priv *) ··· 1515 1515 polling == 0xffffffff && bt_state == 0xff) 1516 1516 return false; 1517 1517 1518 - bt_state &= BIT_OFFSET_LEN_MASK_32(0, 1); 1518 + bt_state &= BIT(0); 1519 1519 if (bt_state != rtlpriv->btcoexist.bt_cur_state) { 1520 1520 rtlpriv->btcoexist.bt_cur_state = bt_state; 1521 1521 ··· 1524 1524 1525 1525 bt_state = bt_state | 1526 1526 ((rtlpriv->btcoexist.bt_ant_isolation == 1) ? 1527 - 0 : BIT_OFFSET_LEN_MASK_32(1, 1)) | 1528 - BIT_OFFSET_LEN_MASK_32(2, 1); 1527 + 0 : BIT(1)) | BIT(2); 1529 1528 rtl_write_byte(rtlpriv, 0x4fd, bt_state); 1530 1529 } 1531 1530 return true; ··· 1554 1555 rtlpriv->btcoexist.bt_service = cur_service_type; 1555 1556 bt_state = bt_state | 1556 1557 ((rtlpriv->btcoexist.bt_ant_isolation == 1) ? 1557 - 0 : BIT_OFFSET_LEN_MASK_32(1, 1)) | 1558 + 0 : BIT(1)) | 1558 1559 ((rtlpriv->btcoexist.bt_service != BT_IDLE) ? 1559 - 0 : BIT_OFFSET_LEN_MASK_32(2, 1)); 1560 + 0 : BIT(2)); 1560 1561 1561 1562 /* Add interrupt migration when bt is not ini 1562 1563 * idle state (no traffic). */
+7 -7
drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.h
··· 46 46 #define pagenum_128(_len) (u32)(((_len)>>7) + ((_len)&0x7F ? 1 : 0)) 47 47 48 48 #define SET_H2CCMD_PWRMODE_PARM_MODE(__ph2ccmd, __val) \ 49 - SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val) 49 + *(u8 *)(__ph2ccmd) = __val 50 50 #define SET_H2CCMD_PWRMODE_PARM_SMART_PS(__ph2ccmd, __val) \ 51 - SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val) 51 + *(u8 *)(__ph2ccmd + 1) = __val 52 52 #define SET_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(__ph2ccmd, __val) \ 53 - SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val) 53 + *(u8 *)(__ph2ccmd + 2) = __val 54 54 #define SET_H2CCMD_JOINBSSRPT_PARM_OPMODE(__ph2ccmd, __val) \ 55 - SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val) 55 + *(u8 *)(__ph2ccmd) = __val 56 56 #define SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(__ph2ccmd, __val) \ 57 - SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val) 57 + *(u8 *)(__ph2ccmd) = __val 58 58 #define SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(__ph2ccmd, __val) \ 59 - SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val) 59 + *(u8 *)(__ph2ccmd + 1) = __val 60 60 #define SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(__ph2ccmd, __val) \ 61 - SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val) 61 + *(u8 *)(__ph2ccmd + 2) = __val 62 62 63 63 int rtl92c_download_fw(struct ieee80211_hw *hw); 64 64 void rtl92c_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,
+5 -6
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c
··· 2299 2299 if (rtlpriv->btcoexist.bt_ant_isolation) 2300 2300 rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, 0xa0); 2301 2301 2302 - u1_tmp = rtl_read_byte(rtlpriv, 0x4fd) & 2303 - BIT_OFFSET_LEN_MASK_32(0, 1); 2302 + u1_tmp = rtl_read_byte(rtlpriv, 0x4fd) & BIT(0); 2304 2303 u1_tmp = u1_tmp | 2305 2304 ((rtlpriv->btcoexist.bt_ant_isolation == 1) ? 2306 - 0 : BIT_OFFSET_LEN_MASK_32(1, 1)) | 2305 + 0 : BIT(1)) | 2307 2306 ((rtlpriv->btcoexist.bt_service == BT_SCO) ? 2308 - 0 : BIT_OFFSET_LEN_MASK_32(2, 1)); 2307 + 0 : BIT(2)); 2309 2308 rtl_write_byte(rtlpriv, 0x4fd, u1_tmp); 2310 2309 2311 2310 rtl_write_dword(rtlpriv, REG_BT_COEX_TABLE+4, 0xaaaa9aaa); ··· 2314 2315 /* Config to 1T1R. */ 2315 2316 if (rtlphy->rf_type == RF_1T1R) { 2316 2317 u1_tmp = rtl_read_byte(rtlpriv, ROFDM0_TRXPATHENABLE); 2317 - u1_tmp &= ~(BIT_OFFSET_LEN_MASK_32(1, 1)); 2318 + u1_tmp &= ~(BIT(1)); 2318 2319 rtl_write_byte(rtlpriv, ROFDM0_TRXPATHENABLE, u1_tmp); 2319 2320 2320 2321 u1_tmp = rtl_read_byte(rtlpriv, ROFDM1_TRXPATHENABLE); 2321 - u1_tmp &= ~(BIT_OFFSET_LEN_MASK_32(1, 1)); 2322 + u1_tmp &= ~(BIT(1)); 2322 2323 rtl_write_byte(rtlpriv, ROFDM1_TRXPATHENABLE, u1_tmp); 2323 2324 } 2324 2325 }