]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging: rtl8192e: Rename NicIFDisableNIC
authorMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Sun, 19 Jul 2015 17:28:07 +0000 (19:28 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Jul 2015 04:24:21 +0000 (21:24 -0700)
Use naming schema found in other rtlwifi devices.
Rename NicIFDisableNIC to rtl92e_disable_nic.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
drivers/staging/rtl8192e/rtl8192e/rtl_core.h

index 817cd62f28b8c4ad3fcca801fc6d1df589c7b93d..a8c62b040d9d2a6e0c71fc24104560367c686033 100644 (file)
@@ -1537,7 +1537,7 @@ static bool SetRFPowerState8190(struct net_device *dev,
 
                        if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC &&
                            !RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) {
-                               NicIFDisableNIC(dev);
+                               rtl92e_disable_nic(dev);
                                RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC);
                        } else if (!(pPSC->RegRfPsLevel &
                                   RT_RF_OFF_LEVL_HALT_NIC)) {
index 5a0217128e8d832758610c6349cf78aa69734e02..9a10a48d175702aa1d29d9a5d0360d1ef3ac1e25 100644 (file)
@@ -2805,7 +2805,7 @@ bool NicIFEnableNIC(struct net_device *dev)
        RT_TRACE(COMP_PS, "<===========%s()\n", __func__);
        return init_status;
 }
-bool NicIFDisableNIC(struct net_device *dev)
+bool rtl92e_disable_nic(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        u8 tmp_state = 0;
index 622ce202842a02d8ad33713b25c64104408dca8a..788170f8913f002fa7bfba611eef2668f74f1b21 100644 (file)
@@ -615,7 +615,7 @@ u8 rtl819x_query_rxpwrpercentage(char antpower);
 void rtl8192_record_rxdesc_forlateruse(struct rtllib_rx_stats *psrc_stats,
                                       struct rtllib_rx_stats *ptarget_stats);
 bool NicIFEnableNIC(struct net_device *dev);
-bool NicIFDisableNIC(struct net_device *dev);
+bool rtl92e_disable_nic(struct net_device *dev);
 
 bool rtl92e_set_rf_state(struct net_device *dev,
                         enum rt_rf_power_state StateToSet,