Commit d0049dfc authored by Ksenija Stanojevic's avatar Ksenija Stanojevic Committed by Greg Kroah-Hartman

Staging: rtl8192: Simplifying if-else statement

This patch simplifies the code by not having two identical paths and
fixes the warning given by checkpatch.pl: "else is not useful after
a break or return".
Signed-off-by: default avatarKsenija Stanojevic <ksenija.stanojevic@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f3aefb5
...@@ -352,16 +352,14 @@ u32 rtl8192_phy_QueryRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath, ...@@ -352,16 +352,14 @@ u32 rtl8192_phy_QueryRFReg(struct net_device *dev, RF90_RADIO_PATH_E eRFPath,
return 0; return 0;
if (priv->Rf_Mode == RF_OP_By_FW) { if (priv->Rf_Mode == RF_OP_By_FW) {
reg = phy_FwRFSerialRead(dev, eRFPath, reg_addr); reg = phy_FwRFSerialRead(dev, eRFPath, reg_addr);
bitshift = rtl8192_CalculateBitShift(bitmask);
reg = (reg & bitmask) >> bitshift;
udelay(200); udelay(200);
return reg;
} else { } else {
reg = rtl8192_phy_RFSerialRead(dev, eRFPath, reg_addr); reg = rtl8192_phy_RFSerialRead(dev, eRFPath, reg_addr);
}
bitshift = rtl8192_CalculateBitShift(bitmask); bitshift = rtl8192_CalculateBitShift(bitmask);
reg = (reg & bitmask) >> bitshift; reg = (reg & bitmask) >> bitshift;
return reg; return reg;
}
} }
/****************************************************************************** /******************************************************************************
......
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