From: Mateusz Kulikowski Date: Sun, 19 Jul 2015 17:27:45 +0000 (+0200) Subject: staging: rtl8192e: Rename rtl8192_BBConfig X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2949353dde018594063d20b6dc38cc86b1846729;p=deliverable%2Flinux.git staging: rtl8192e: Rename rtl8192_BBConfig Use naming schema found in other rtlwifi devices. Rename rtl8192_BBConfig to rtl92e_config_bb. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 9a8bd1955f74..22625950706b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -750,7 +750,7 @@ start: } } RT_TRACE(COMP_INIT, "BB Config Start!\n"); - rtStatus = rtl8192_BBConfig(dev); + rtStatus = rtl92e_config_bb(dev); if (!rtStatus) { netdev_warn(dev, "%s(): Failed to configure BB\n", __func__); return rtStatus; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index c674932e2fe8..3c6916bcea59 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -599,7 +599,7 @@ static bool rtl8192_BB_Config_ParaFile(struct net_device *dev) return rtStatus; } -bool rtl8192_BBConfig(struct net_device *dev) +bool rtl92e_config_bb(struct net_device *dev) { rtl8192_InitBBRFRegDef(dev); return rtl8192_BB_Config_ParaFile(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h index 2f1db77e6aa9..cd4b242e18e4 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -83,7 +83,7 @@ extern void rtl8192_phy_configmac(struct net_device *dev); extern bool rtl8192_phy_checkBBAndRF(struct net_device *dev, enum hw90_block CheckBlock, enum rf90_radio_path eRFPath); -extern bool rtl8192_BBConfig(struct net_device *dev); +extern bool rtl92e_config_bb(struct net_device *dev); extern void rtl8192_phy_getTxPower(struct net_device *dev); extern void rtl8192_phy_setTxPower(struct net_device *dev, u8 channel); extern bool rtl8192_phy_RFConfig(struct net_device *dev);