This patch replace BITn macro to BIT(n).
Signed-off-by: Ivan Safonov <insafo...@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 26 ++++++++++++-----------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 46e0fdd..5d5e192 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -106,8 +106,8 @@ void _8051Reset88E(struct adapter *padapter)
u8 u1bTmp;
u1bTmp = usb_read8(padapter, REG_SYS_FUNC_EN+1);
- usb_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp&(~BIT2));
- usb_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp|(BIT2));
+ usb_write8(padapter, REG_SYS_FUNC_EN + 1, u1bTmp & ~BIT(2));
+ usb_write8(padapter, REG_SYS_FUNC_EN + 1, u1bTmp | BIT(2));
DBG_88E("=====> _8051Reset88E(): 8051 reset success .\n");
}
@@ -184,10 +184,12 @@ static void hal_notch_filter_8188e(struct adapter
*adapter, bool enable)
{
if (enable) {
DBG_88E("Enable notch filter\n");
- usb_write8(adapter, rOFDM0_RxDSP+1, usb_read8(adapter,
rOFDM0_RxDSP+1) | BIT1);
+ usb_write8(adapter, rOFDM0_RxDSP + 1,
+ usb_read8(adapter, rOFDM0_RxDSP + 1) | BIT(1));
} else {
DBG_88E("Disable notch filter\n");
- usb_write8(adapter, rOFDM0_RxDSP+1, usb_read8(adapter,
rOFDM0_RxDSP+1) & ~BIT1);
+ usb_write8(adapter, rOFDM0_RxDSP + 1,
+ usb_read8(adapter, rOFDM0_RxDSP + 1) & ~BIT(1));
}
}
void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
@@ -372,7 +374,7 @@ static void Hal_ReadPowerValueFromPROM_8188E(struct
txpowerinfo24g *pwrInfo24G,
pwrInfo24G->BW20_Diff[rfPath][TxCount]
= EEPROM_DEFAULT_24G_HT20_DIFF;
} else {
pwrInfo24G->BW20_Diff[rfPath][TxCount]
= (PROMContent[eeAddr]&0xf0)>>4;
- if
(pwrInfo24G->BW20_Diff[rfPath][TxCount] & BIT3) /* 4bit sign
number to 8 bit sign number */
+ if
(pwrInfo24G->BW20_Diff[rfPath][TxCount] & BIT(3)) /* 4bit sign
number to 8 bit sign number */
pwrInfo24G->BW20_Diff[rfPath][TxCount] |= 0xF0;
}
@@ -380,7 +382,7 @@ static void Hal_ReadPowerValueFromPROM_8188E(struct
txpowerinfo24g *pwrInfo24G,
pwrInfo24G->OFDM_Diff[rfPath][TxCount]
= EEPROM_DEFAULT_24G_OFDM_DIFF;
} else {
pwrInfo24G->OFDM_Diff[rfPath][TxCount]
= (PROMContent[eeAddr]&0x0f);
- if
(pwrInfo24G->OFDM_Diff[rfPath][TxCount] & BIT3) /* 4bit sign
number to 8 bit sign number */
+ if
(pwrInfo24G->OFDM_Diff[rfPath][TxCount] & BIT(3)) /* 4bit sign
number to 8 bit sign number */
pwrInfo24G->OFDM_Diff[rfPath][TxCount] |= 0xF0;
}
pwrInfo24G->CCK_Diff[rfPath][TxCount] = 0;
@@ -390,7 +392,7 @@ static void Hal_ReadPowerValueFromPROM_8188E(struct
txpowerinfo24g *pwrInfo24G,
pwrInfo24G->BW40_Diff[rfPath][TxCount]
= EEPROM_DEFAULT_DIFF;
} else {
pwrInfo24G->BW40_Diff[rfPath][TxCount]
= (PROMContent[eeAddr]&0xf0)>>4;
- if
(pwrInfo24G->BW40_Diff[rfPath][TxCount] & BIT3) /* 4bit sign
number to 8 bit sign number */
+ if
(pwrInfo24G->BW40_Diff[rfPath][TxCount] & BIT(3)) /* 4bit sign
number to 8 bit sign number */
pwrInfo24G->BW40_Diff[rfPath][TxCount] |= 0xF0;
}
@@ -398,7 +400,7 @@ static void Hal_ReadPowerValueFromPROM_8188E(struct
txpowerinfo24g *pwrInfo24G,
pwrInfo24G->BW20_Diff[rfPath][TxCount]
= EEPROM_DEFAULT_DIFF;
} else {
pwrInfo24G->BW20_Diff[rfPath][TxCount]
= (PROMContent[eeAddr]&0x0f);
- if
(pwrInfo24G->BW20_Diff[rfPath][TxCount] & BIT3) /* 4bit sign
number to 8 bit sign number */
+ if
(pwrInfo24G->BW20_Diff[rfPath][TxCount] & BIT(3)) /* 4bit sign
number to 8 bit sign number */
pwrInfo24G->BW20_Diff[rfPath][TxCount] |= 0xF0;
}
eeAddr++;
@@ -407,7 +409,7 @@ static void Hal_ReadPowerValueFromPROM_8188E(struct
txpowerinfo24g *pwrInfo24G,
pwrInfo24G->OFDM_Diff[rfPath][TxCount]
= EEPROM_DEFAULT_DIFF;
} else {
pwrInfo24G->OFDM_Diff[rfPath][TxCount]
= (PROMContent[eeAddr]&0xf0)>>4;
- if
(pwrInfo24G->OFDM_Diff[rfPath][TxCount] & BIT3) /* 4bit sign
number to 8 bit sign number */
+ if
(pwrInfo24G->OFDM_Diff[rfPath][TxCount] & BIT(3)) /* 4bit sign
number to 8 bit sign number */
pwrInfo24G->OFDM_Diff[rfPath][TxCount] |= 0xF0;
}
@@ -415,7 +417,7 @@ static void Hal_ReadPowerValueFromPROM_8188E(struct
txpowerinfo24g *pwrInfo24G,
pwrInfo24G->CCK_Diff[rfPath][TxCount] =
EEPROM_DEFAULT_DIFF;
} else {
pwrInfo24G->CCK_Diff[rfPath][TxCount] =
(PROMContent[eeAddr]&0x0f);
- if
(pwrInfo24G->CCK_Diff[rfPath][TxCount] & BIT3) /* 4bit sign
number to 8 bit sign number */
+ if
(pwrInfo24G->CCK_Diff[rfPath][TxCount] & BIT(3)) /* 4bit sign
number to 8 bit sign number */
pwrInfo24G->CCK_Diff[rfPath][TxCount] |= 0xF0;
}
eeAddr++;
@@ -453,13 +455,13 @@ void Hal_ReadPowerSavingMode88E(struct adapter *padapter,
u8 *hwinfo, bool AutoL
/* hw power down mode selection , 0:rf-off / 1:power down */
if (padapter->registrypriv.hwpdn_mode == 2)
- padapter->pwrctrlpriv.bHWPowerdown =
(hwinfo[EEPROM_RF_FEATURE_OPTION_88E] & BIT4);
+ padapter->pwrctrlpriv.bHWPowerdown =
(hwinfo[EEPROM_RF_FEATURE_OPTION_88E] & BIT(4));
else
padapter->pwrctrlpriv.bHWPowerdown =
padapter->registrypriv.hwpdn_mode;
/* decide hw if support remote wakeup function */
/* if hw supported, 8051 (SIE) will generate WeakUP
signal(D+/D- toggle) when autoresume */
- padapter->pwrctrlpriv.bSupportRemoteWakeup =
(hwinfo[EEPROM_USB_OPTIONAL_FUNCTION0] & BIT1) ? true : false;
+ padapter->pwrctrlpriv.bSupportRemoteWakeup =
(hwinfo[EEPROM_USB_OPTIONAL_FUNCTION0] & BIT(1)) ? true : false;
DBG_88E("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,
bSupportRemoteWakeup(%x)\n", __func__,
padapter->pwrctrlpriv.bHWPwrPindetect,
padapter->pwrctrlpriv.bHWPowerdown ,
padapter->pwrctrlpriv.bSupportRemoteWakeup);
--
2.4.9
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
