Commit c7bf6d33 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Rename Regdot11HTOper.., bSupportM.. and PowerSaveCo.. 



Rename variable Regdot11HTOperationalRateSet to
reg_dot11ht_oper_rate_set, bSupportMode to support_mode and
PowerSaveControl to pwr_save_ctrl to avoid CamelCase which is not accepted
by checkpatch. Fix unnecessary parentheses warning from checkpatch when
used with this variables.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/1ef7fd22b4a037c4d1f8685065ce7916b6f0930b.1668313325.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b397fc48

drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, 
{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					(&(priv->rtllib->PowerSaveControl));

					(&priv->rtllib->pwr_save_ctrl);

	bool bResult = true;

	u8	i = 0, QueueID = 0;

	struct rtl8192_tx_ring  *ring = NULL;

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+15 −15
Original line number Diff line number Diff line
@@ -607,13 +607,13 @@ static void _rtl92e_refresh_support_rate(struct r8192_priv *priv) 


	if (ieee->mode == WIRELESS_MODE_N_24G ||

	    ieee->mode == WIRELESS_MODE_N_5G) {

		memcpy(ieee->Regdot11HTOperationalRateSet,

		memcpy(ieee->reg_dot11ht_oper_rate_set,

		       ieee->RegHTSuppRateSet, 16);

		memcpy(ieee->Regdot11TxHTOperationalRateSet,

		       ieee->RegHTSuppRateSet, 16);



	} else {

		memset(ieee->Regdot11HTOperationalRateSet, 0, 16);

		memset(ieee->reg_dot11ht_oper_rate_set, 0, 16);

	}

}
@@ -642,19 +642,19 @@ static u8 _rtl92e_get_supported_wireless_mode(struct net_device *dev) 
void rtl92e_set_wireless_mode(struct net_device *dev, u8 wireless_mode)

{

	struct r8192_priv *priv = rtllib_priv(dev);

	u8 bSupportMode = _rtl92e_get_supported_wireless_mode(dev);

	u8 support_mode = _rtl92e_get_supported_wireless_mode(dev);



	if ((wireless_mode == WIRELESS_MODE_AUTO) ||

	    ((wireless_mode & bSupportMode) == 0)) {

		if (bSupportMode & WIRELESS_MODE_N_24G) {

	    ((wireless_mode & support_mode) == 0)) {

		if (support_mode & WIRELESS_MODE_N_24G) {

			wireless_mode = WIRELESS_MODE_N_24G;

		} else if (bSupportMode & WIRELESS_MODE_N_5G) {

		} else if (support_mode & WIRELESS_MODE_N_5G) {

			wireless_mode = WIRELESS_MODE_N_5G;

		} else if ((bSupportMode & WIRELESS_MODE_A)) {

		} else if ((support_mode & WIRELESS_MODE_A)) {

			wireless_mode = WIRELESS_MODE_A;

		} else if ((bSupportMode & WIRELESS_MODE_G)) {

		} else if ((support_mode & WIRELESS_MODE_G)) {

			wireless_mode = WIRELESS_MODE_G;

		} else if ((bSupportMode & WIRELESS_MODE_B)) {

		} else if ((support_mode & WIRELESS_MODE_B)) {

			wireless_mode = WIRELESS_MODE_B;

		} else {

			netdev_info(dev,
@@ -683,7 +683,7 @@ static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset) 
{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					(&priv->rtllib->PowerSaveControl);

					(&priv->rtllib->pwr_save_ctrl);

	bool init_status;



	priv->bdisable_nic = false;
@@ -820,7 +820,7 @@ static void _rtl92e_init_priv_constant(struct net_device *dev) 
{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					&priv->rtllib->PowerSaveControl;

					&priv->rtllib->pwr_save_ctrl;



	pPSC->reg_max_lps_awake_intvl = 5;

}
@@ -877,7 +877,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) 
	priv->rf_change_in_progress = false;

	priv->bHwRfOffAction = 0;

	priv->SetRFPowerStateInProgress = false;

	priv->rtllib->PowerSaveControl.bLeisurePs = true;

	priv->rtllib->pwr_save_ctrl.bLeisurePs = true;

	priv->rtllib->LPSDelayCnt = 0;

	priv->rtllib->sta_sleep = LPS_IS_WAKE;

	priv->rtllib->rf_power_state = rf_on;
@@ -1272,7 +1272,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) 
	static u8 check_reset_cnt;

	unsigned long flags;

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					(&priv->rtllib->PowerSaveControl);

					(&priv->rtllib->pwr_save_ctrl);

	bool bBusyTraffic = false;

	bool	bHigherBusyTraffic = false;

	bool	bHigherBusyRxTraffic = false;
@@ -1295,7 +1295,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) 
		     RTLLIB_NOLINK) &&

		     (ieee->rf_power_state == rf_on) && !ieee->is_set_key &&

		     (!ieee->proto_stoppping) && !ieee->wx_set_enc) {

			if ((ieee->PowerSaveControl.ReturnPoint ==

			if ((ieee->pwr_save_ctrl.ReturnPoint ==

			     IPS_CALLBACK_NONE) &&

			     (!ieee->bNetPromiscuousMode)) {

				rtl92e_ips_enter(dev);
@@ -2422,7 +2422,7 @@ bool rtl92e_enable_nic(struct net_device *dev) 
	bool init_status = true;

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					(&priv->rtllib->PowerSaveControl);

					(&priv->rtllib->pwr_save_ctrl);



	if (!priv->up) {

		netdev_warn(dev, "%s(): Driver is already down!\n", __func__);

drivers/staging/rtl8192e/rtl8192e/rtl_ps.c

+5 −5
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void _rtl92e_ps_update_rf_state(struct net_device *dev) 
{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					&(priv->rtllib->PowerSaveControl);

					&priv->rtllib->pwr_save_ctrl;



	pPSC->bSwRfProcessing = true;

	rtl92e_set_rf_state(dev, pPSC->eInactivePowerState, RF_CHANGE_BY_IPS);
@@ -113,7 +113,7 @@ void rtl92e_ips_enter(struct net_device *dev) 
{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					&(priv->rtllib->PowerSaveControl);

					&priv->rtllib->pwr_save_ctrl;

	enum rt_rf_power_state rt_state;



	rt_state = priv->rtllib->rf_power_state;
@@ -129,7 +129,7 @@ void rtl92e_ips_leave(struct net_device *dev) 
{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					&(priv->rtllib->PowerSaveControl);

					&priv->rtllib->pwr_save_ctrl;

	enum rt_rf_power_state rt_state;



	rt_state = priv->rtllib->rf_power_state;
@@ -207,7 +207,7 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) 
{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					&(priv->rtllib->PowerSaveControl);

					&priv->rtllib->pwr_save_ctrl;



	if (!((priv->rtllib->iw_mode == IW_MODE_INFRA) &&

	    (priv->rtllib->state == RTLLIB_LINKED))
@@ -233,7 +233,7 @@ void rtl92e_leisure_ps_leave(struct net_device *dev) 
{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					&(priv->rtllib->PowerSaveControl);

					&priv->rtllib->pwr_save_ctrl;



	if (pPSC->bLeisurePs) {

		if (priv->rtllib->ps != RTLLIB_PS_DISABLED) {

drivers/staging/rtl8192e/rtl8192e/rtl_wx.c

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int _rtl92e_wx_adapter_power_status(struct net_device *dev, 
{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					(&priv->rtllib->PowerSaveControl);

					(&priv->rtllib->pwr_save_ctrl);

	struct rtllib_device *ieee = priv->rtllib;



	mutex_lock(&priv->wx_mutex);
@@ -189,7 +189,7 @@ static int _rtl92e_wx_set_lps_awake_interval(struct net_device *dev, 
{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					(&priv->rtllib->PowerSaveControl);

					(&priv->rtllib->pwr_save_ctrl);



	mutex_lock(&priv->wx_mutex);

drivers/staging/rtl8192e/rtl819x_HTProc.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, 
		pCapELE->MPDUDensity	= 0;

	}



	memcpy(pCapELE->MCS, ieee->Regdot11HTOperationalRateSet, 16);

	memcpy(pCapELE->MCS, ieee->reg_dot11ht_oper_rate_set, 16);

	memset(&pCapELE->ExtHTCapInfo, 0, 2);

	memset(pCapELE->TxBFCap, 0, 4);