From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:13:22 +0000 (+0200) Subject: staging: rtl8192e: Rename rtl8192_phy_RFSerialRead X-Git-Tag: firefly_0821_release~176^2~802^2~1667 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6edb1763ca7a97148fb8c7ccb8311c442d941f6f;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Rename rtl8192_phy_RFSerialRead Use naming schema found in other rtlwifi devices. Rename rtl8192_phy_RFSerialRead to _rtl92e_phy_rf_read. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index eed3c0bb871d..59d5f2a97854 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -105,8 +105,9 @@ u32 rtl92e_get_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask) return Ret; } -static u32 rtl8192_phy_RFSerialRead(struct net_device *dev, - enum rf90_radio_path eRFPath, u32 Offset) + +static u32 _rtl92e_phy_rf_read(struct net_device *dev, + enum rf90_radio_path eRFPath, u32 Offset) { struct r8192_priv *priv = rtllib_priv(dev); u32 ret = 0; @@ -241,8 +242,8 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath, } else { if (BitMask != bMask12Bits) { - Original_Value = rtl8192_phy_RFSerialRead(dev, eRFPath, - RegAddr); + Original_Value = _rtl92e_phy_rf_read(dev, eRFPath, + RegAddr); BitShift = rtl8192_CalculateBitShift(BitMask); New_Value = (((Original_Value) & (~BitMask)) | (Data << BitShift)); @@ -269,8 +270,7 @@ u32 rtl92e_get_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath, Original_Value = _rtl92e_phy_rf_fw_read(dev, eRFPath, RegAddr); udelay(200); } else { - Original_Value = rtl8192_phy_RFSerialRead(dev, eRFPath, - RegAddr); + Original_Value = _rtl92e_phy_rf_read(dev, eRFPath, RegAddr); } BitShift = rtl8192_CalculateBitShift(BitMask); Readback_Value = (Original_Value & BitMask) >> BitShift;