staging: rtl8188eu: Rework function PHY_SwChnl8188E()

Rename CamelCase variables and function name.

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index f41e83d819879b3ea6d0c71ef8e73472c9101e99..7a8fe53d063c233c04b09a748c81ce046664c4a7 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -222,7 +222,7 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->read_chip_version = &rtl8188e_read_chip_version;
 
        pHalFunc->set_bwmode_handler = &phy_set_bw_mode;
-       pHalFunc->set_channel_handler = &PHY_SwChnl8188E;
+       pHalFunc->set_channel_handler = &phy_sw_chnl;
 
        pHalFunc->hal_dm_watchdog = &rtl8188e_HalDmWatchDog;
 

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c b/drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c
index b1ff8922aafd527be703d36042f49ee22eb325a5..5041da0f7c8077a578e836838157428e18e82b2c 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c
@@ -355,30 +355,27 @@ static void phy_sw_chnl_callback(struct adapter *adapt, u8 channel)
        }
 }
 
-void PHY_SwChnl8188E(struct adapter *Adapter, u8 channel)
+void phy_sw_chnl(struct adapter *adapt, u8 channel)
 {
-       /*  Call after initialization */
-       struct hal_data_8188e   *pHalData = GET_HAL_DATA(Adapter);
-       u8 tmpchannel = pHalData->CurrentChannel;
-       bool  bResult = true;
+       struct hal_data_8188e *hal_data = GET_HAL_DATA(adapt);
+       u8 tmpchannel = hal_data->CurrentChannel;
+       bool  result = true;
 
-       if (pHalData->rf_chip == RF_PSEUDO_11N)
-               return;         /* return immediately if it is peudo-phy */
+       if (hal_data->rf_chip == RF_PSEUDO_11N)
+               return;
 
        if (channel == 0)
                channel = 1;
 
-       pHalData->CurrentChannel = channel;
+       hal_data->CurrentChannel = channel;
 
-       if ((!Adapter->bDriverStopped) && (!Adapter->bSurpriseRemoved)) {
-               phy_sw_chnl_callback(Adapter, channel);
+       if ((!adapt->bDriverStopped) && (!adapt->bSurpriseRemoved)) {
+               phy_sw_chnl_callback(adapt, channel);
 
-               if (bResult)
-                       ;
-               else
-                       pHalData->CurrentChannel = tmpchannel;
+               if (!result)
+                       hal_data->CurrentChannel = tmpchannel;
 
        } else {
-               pHalData->CurrentChannel = tmpchannel;
+               hal_data->CurrentChannel = tmpchannel;
        }
 }

diff --git a/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h b/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h
index f8bc63cb2e9bf6c46357bdce5c2a15eae3023e8f..20e6b40fc35cb082a2a993bc7d172451053aef14 100644 (file)
--- a/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h
+++ b/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h
@@ -207,8 +207,6 @@ void PHY_GetTxPowerLevel8188E(struct adapter *adapter, u32 *powerlevel);
 
 void PHY_ScanOperationBackup8188E(struct adapter *Adapter, u8 Operation);
 
-/*  channel switch related funciton */
-void PHY_SwChnl8188E(struct adapter *adapter, u8 channel);
 /*  Call after initialization */
 void ChkFwCmdIoDone(struct adapter *adapter);
 

diff --git a/drivers/staging/rtl8188eu/include/phy.h b/drivers/staging/rtl8188eu/include/phy.h
index 5b939871ffbd7f2c9ffb10eae528b436fbc91ac6..defed4a921d3eafae7f6af28d60ba60d88ae6e57 100644 (file)
--- a/drivers/staging/rtl8188eu/include/phy.h
+++ b/drivers/staging/rtl8188eu/include/phy.h
@@ -13,3 +13,4 @@ void phy_set_tx_power_level(struct adapter *adapt, u8 channel);
 
 void phy_set_bw_mode(struct adapter *adapt, enum ht_channel_width bandwidth,
                     unsigned char offset);
+void phy_sw_chnl(struct adapter *adapt, u8 channel);