Commit 3589e748 authored by Sanjana Sanikommu's avatar Sanjana Sanikommu Committed by Greg Kroah-Hartman

staging: rtl8192e: Remove unnecessary parentheses.

Challenge suggested by coccinelle.
Remove unnecessary parentheses around the right hand of
assignment using the below script.

@@
local idexpression id;
expression e;
@@

id =
-(
e
-)

@@ expression e, e1, e2,e3,e4; @@
e =
-(((e1) & (e2)) |
-(e3 << e4))
+(e1 & e2) |
+(e3 << e4)
Signed-off-by: default avatarSanjana Sanikommu <sanjana99reddy99@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c724e19
...@@ -81,8 +81,7 @@ void rtl92e_set_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask, ...@@ -81,8 +81,7 @@ void rtl92e_set_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask,
if (dwBitMask != bMaskDWord) { if (dwBitMask != bMaskDWord) {
OriginalValue = rtl92e_readl(dev, dwRegAddr); OriginalValue = rtl92e_readl(dev, dwRegAddr);
BitShift = _rtl92e_calculate_bit_shift(dwBitMask); BitShift = _rtl92e_calculate_bit_shift(dwBitMask);
NewValue = (((OriginalValue) & (~dwBitMask)) | NewValue = (OriginalValue & ~dwBitMask) | (dwData << BitShift);
(dwData << BitShift));
rtl92e_writel(dev, dwRegAddr, NewValue); rtl92e_writel(dev, dwRegAddr, NewValue);
} else } else
rtl92e_writel(dev, dwRegAddr, dwData); rtl92e_writel(dev, dwRegAddr, dwData);
...@@ -188,7 +187,7 @@ static void _rtl92e_phy_rf_write(struct net_device *dev, ...@@ -188,7 +187,7 @@ static void _rtl92e_phy_rf_write(struct net_device *dev,
NewOffset = Offset; NewOffset = Offset;
} }
DataAndAddr = (Data<<16) | (NewOffset&0x3f); DataAndAddr = (NewOffset & 0x3f) | (Data << 16);
rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, bMaskDWord, DataAndAddr); rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, bMaskDWord, DataAndAddr);
...@@ -223,8 +222,7 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath, ...@@ -223,8 +222,7 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
Original_Value = _rtl92e_phy_rf_fw_read(dev, eRFPath, Original_Value = _rtl92e_phy_rf_fw_read(dev, eRFPath,
RegAddr); RegAddr);
BitShift = _rtl92e_calculate_bit_shift(BitMask); BitShift = _rtl92e_calculate_bit_shift(BitMask);
New_Value = (((Original_Value) & (~BitMask)) | New_Value = (Original_Value & ~BitMask) | (Data << BitShift);
(Data << BitShift));
_rtl92e_phy_rf_fw_write(dev, eRFPath, RegAddr, _rtl92e_phy_rf_fw_write(dev, eRFPath, RegAddr,
New_Value); New_Value);
...@@ -237,8 +235,7 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath, ...@@ -237,8 +235,7 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
Original_Value = _rtl92e_phy_rf_read(dev, eRFPath, Original_Value = _rtl92e_phy_rf_read(dev, eRFPath,
RegAddr); RegAddr);
BitShift = _rtl92e_calculate_bit_shift(BitMask); BitShift = _rtl92e_calculate_bit_shift(BitMask);
New_Value = (((Original_Value) & (~BitMask)) | New_Value = (Original_Value & ~BitMask) | (Data << BitShift);
(Data << BitShift));
_rtl92e_phy_rf_write(dev, eRFPath, RegAddr, New_Value); _rtl92e_phy_rf_write(dev, eRFPath, RegAddr, New_Value);
} else } else
...@@ -571,9 +568,9 @@ static bool _rtl92e_bb_config_para_file(struct net_device *dev) ...@@ -571,9 +568,9 @@ static bool _rtl92e_bb_config_para_file(struct net_device *dev)
if (priv->IC_Cut > VERSION_8190_BD) { if (priv->IC_Cut > VERSION_8190_BD) {
if (priv->rf_type == RF_2T4R) if (priv->rf_type == RF_2T4R)
dwRegValue = (priv->AntennaTxPwDiff[2]<<8 | dwRegValue = priv->AntennaTxPwDiff[2]<<8 |
priv->AntennaTxPwDiff[1]<<4 | priv->AntennaTxPwDiff[1]<<4 |
priv->AntennaTxPwDiff[0]); priv->AntennaTxPwDiff[0];
else else
dwRegValue = 0x0; dwRegValue = 0x0;
rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage, rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage,
...@@ -655,9 +652,9 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) ...@@ -655,9 +652,9 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel)
priv->AntennaTxPwDiff[1] = (u8)(ant_pwr_diff); priv->AntennaTxPwDiff[1] = (u8)(ant_pwr_diff);
priv->AntennaTxPwDiff[0] = 0; priv->AntennaTxPwDiff[0] = 0;
u4RegValue = (priv->AntennaTxPwDiff[2]<<8 | u4RegValue = priv->AntennaTxPwDiff[2]<<8 |
priv->AntennaTxPwDiff[1]<<4 | priv->AntennaTxPwDiff[1]<<4 |
priv->AntennaTxPwDiff[0]); priv->AntennaTxPwDiff[0];
rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage, rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage,
(bXBTxAGC|bXCTxAGC|bXDTxAGC), (bXBTxAGC|bXCTxAGC|bXDTxAGC),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment