From: Mateusz Kulikowski Date: Sun, 19 Jul 2015 17:27:42 +0000 (+0200) Subject: staging: rtl8192e: Rename InitialGain819xPci X-Git-Tag: v4.3-rc1~158^2~460 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dfb7a12773fb81ef0b15bc8f33297fbd6586fd0c;p=karo-tx-linux.git staging: rtl8192e: Rename InitialGain819xPci Use naming schema found in other rtlwifi devices. Rename InitialGain819xPci to rtl92e_init_gain. 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 5d493c6b56ea..7a3e34f1c857 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1295,7 +1295,7 @@ void rtl8192_SetBWMode(struct net_device *dev, enum ht_channel_width Bandwidth, } -void InitialGain819xPci(struct net_device *dev, u8 Operation) +void rtl92e_init_gain(struct net_device *dev, u8 Operation) { #define SCAN_RX_INITIAL_GAIN 0x17 #define POWER_DETECTION_TH 0x08 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h index ef85587c6a12..f4bf9748a28c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -95,7 +95,7 @@ extern u8 rtl8192_phy_SwChnl(struct net_device *dev, u8 channel); extern void rtl8192_SetBWMode(struct net_device *dev, enum ht_channel_width Bandwidth, enum ht_extchnl_offset Offset); -extern void InitialGain819xPci(struct net_device *dev, u8 Operation); +extern void rtl92e_init_gain(struct net_device *dev, u8 Operation); extern void PHY_SetRtl8192eRfOff(struct net_device *dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 08f2d727dc0f..c3c578dfe6a6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -893,7 +893,7 @@ static void rtl8192_init_priv_handler(struct net_device *dev) priv->rtllib->SetHwRegHandler = rtl92e_set_reg; priv->rtllib->AllowAllDestAddrHandler = rtl92e_set_monitor_mode; priv->rtllib->SetFwCmdHandler = NULL; - priv->rtllib->InitialGainHandler = InitialGain819xPci; + priv->rtllib->InitialGainHandler = rtl92e_init_gain; priv->rtllib->rtllib_ips_leave_wq = rtllib_ips_leave_wq; priv->rtllib->rtllib_ips_leave = rtllib_ips_leave;