From ba50fbc0ee735a31ef7a081f322563a4d945ceb1 Mon Sep 17 00:00:00 2001 From: navin patidar Date: Sun, 31 Aug 2014 12:14:30 +0530 Subject: [PATCH] staging: rtl8188eu: Rework function PHY_SwChnl8188E() Rename CamelCase variables and function name. Signed-off-by: navin patidar Signed-off-by: Greg Kroah-Hartman --- .../staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 +- .../staging/rtl8188eu/hal/rtl8188e_phycfg.c | 27 +++++++++---------- .../rtl8188eu/include/Hal8188EPhyCfg.h | 2 -- drivers/staging/rtl8188eu/include/phy.h | 1 + 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c index f41e83d81987..7a8fe53d063c 100644 --- 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 b1ff8922aafd..5041da0f7c80 100644 --- 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 f8bc63cb2e9b..20e6b40fc35c 100644 --- 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 5b939871ffbd..defed4a921d3 100644 --- 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); -- 2.20.1