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

staging: rtl8192e: Rename eRFPowerState, eRfOff and eRfOn 



Rename variable eRFPowerState to rf_power_state, eRfOff to rf_off and
eRfOn to rf_on to avoid CamelCase which is not accepted by checkpatch.
Omit the upfront "e" as no RFPowerState, RfOff and RfOn exist and it
makes the variables unnecessary long.

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


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

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+5 −5
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ bool rtl92e_start_adapter(struct net_device *dev) 
	priv->pFirmware->status = FW_STATUS_0_INIT;



	if (priv->RegRfOff)

		priv->rtllib->eRFPowerState = eRfOff;

		priv->rtllib->rf_power_state = rf_off;



	ulRegRead = rtl92e_readl(dev, CPU_GEN);

	if (priv->pFirmware->status == FW_STATUS_0_INIT)
@@ -757,13 +757,13 @@ bool rtl92e_start_adapter(struct net_device *dev) 
	rtl92e_writeb(dev, 0x87, 0x0);



	if (priv->RegRfOff) {

		rtl92e_set_rf_state(dev, eRfOff, RF_CHANGE_BY_SW);

		rtl92e_set_rf_state(dev, rf_off, RF_CHANGE_BY_SW);

	} else if (priv->rtllib->RfOffReason > RF_CHANGE_BY_PS) {

		rtl92e_set_rf_state(dev, eRfOff, priv->rtllib->RfOffReason);

		rtl92e_set_rf_state(dev, rf_off, priv->rtllib->RfOffReason);

	} else if (priv->rtllib->RfOffReason >= RF_CHANGE_BY_IPS) {

		rtl92e_set_rf_state(dev, eRfOff, priv->rtllib->RfOffReason);

		rtl92e_set_rf_state(dev, rf_off, priv->rtllib->RfOffReason);

	} else {

		priv->rtllib->eRFPowerState = eRfOn;

		priv->rtllib->rf_power_state = rf_on;

		priv->rtllib->RfOffReason = 0;

	}

drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c

+13 −13
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath, 


	if (!rtl92e_is_legal_rf_path(dev, eRFPath))

		return;

	if (priv->rtllib->eRFPowerState != eRfOn && !priv->being_init_adapter)

	if (priv->rtllib->rf_power_state != rf_on && !priv->being_init_adapter)

		return;



	if (priv->Rf_Mode == RF_OP_By_FW) {
@@ -237,7 +237,7 @@ u32 rtl92e_get_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath, 


	if (!rtl92e_is_legal_rf_path(dev, eRFPath))

		return 0;

	if (priv->rtllib->eRFPowerState != eRfOn && !priv->being_init_adapter)

	if (priv->rtllib->rf_power_state != rf_on && !priv->being_init_adapter)

		return	0;

	mutex_lock(&priv->rf_mutex);

	if (priv->Rf_Mode == RF_OP_By_FW) {
@@ -1301,7 +1301,7 @@ void rtl92e_set_rf_off(struct net_device *dev) 
}



static bool _rtl92e_set_rf_power_state(struct net_device *dev,

				       enum rt_rf_power_state eRFPowerState)

				       enum rt_rf_power_state rf_power_state)

{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
@@ -1316,9 +1316,9 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, 


	switch (priv->rf_chip) {

	case RF_8256:

		switch (eRFPowerState) {

		case eRfOn:

			if ((priv->rtllib->eRFPowerState == eRfOff) &&

		switch (rf_power_state) {

		case rf_on:

			if ((priv->rtllib->rf_power_state == rf_off) &&

			     RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) {

				bool rtstatus;

				u32 InitilizeCount = 3;
@@ -1364,7 +1364,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, 
			break;



		case eRfSleep:

			if (priv->rtllib->eRFPowerState == eRfOff)

			if (priv->rtllib->rf_power_state == rf_off)

				break;
@@ -1386,7 +1386,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, 
			rtl92e_set_rf_off(dev);

			break;



		case eRfOff:

		case rf_off:

			for (QueueID = 0, i = 0; QueueID < MAX_TX_QUEUE; ) {

				ring = &priv->tx_ring[QueueID];
@@ -1418,7 +1418,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, 
			bResult = false;

			netdev_warn(dev,

				    "%s(): Unknown state requested: 0x%X.\n",

				    __func__, eRFPowerState);

				    __func__, rf_power_state);

			break;

		}
@@ -1430,7 +1430,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, 
	}



	if (bResult) {

		priv->rtllib->eRFPowerState = eRFPowerState;

		priv->rtllib->rf_power_state = rf_power_state;



		switch (priv->rf_chip) {

		case RF_8256:
@@ -1447,18 +1447,18 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev, 
}



bool rtl92e_set_rf_power_state(struct net_device *dev,

			       enum rt_rf_power_state eRFPowerState)

			       enum rt_rf_power_state rf_power_state)

{

	struct r8192_priv *priv = rtllib_priv(dev);



	bool bResult = false;



	if (eRFPowerState == priv->rtllib->eRFPowerState &&

	if (rf_power_state == priv->rtllib->rf_power_state &&

	    priv->bHwRfOffAction == 0) {

		return bResult;

	}



	bResult = _rtl92e_set_rf_power_state(dev, eRFPowerState);

	bResult = _rtl92e_set_rf_power_state(dev, rf_power_state);

	return bResult;

}

drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operation); 
void rtl92e_set_rf_off(struct net_device *dev);



bool rtl92e_set_rf_power_state(struct net_device *dev,

			       enum rt_rf_power_state eRFPowerState);

			       enum rt_rf_power_state rf_power_state);



void rtl92e_scan_op_backup(struct net_device *dev, u8 Operation);

drivers/staging/rtl8192e/rtl8192e/rtl_cam.c

+2 −2
Original line number Diff line number Diff line
@@ -80,9 +80,9 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex, 
	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);

	enum rt_rf_power_state rt_state;



	rt_state = priv->rtllib->eRFPowerState;

	rt_state = priv->rtllib->rf_power_state;

	if (priv->rtllib->PowerSaveControl.bInactivePs) {

		if (rt_state == eRfOff) {

		if (rt_state == rf_off) {

			if (priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) {

				netdev_warn(dev, "%s(): RF is OFF.\n",

					    __func__);

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+13 −13
Original line number Diff line number Diff line
@@ -166,10 +166,10 @@ bool rtl92e_set_rf_state(struct net_device *dev, 
		}

	}



	rt_state = priv->rtllib->eRFPowerState;

	rt_state = priv->rtllib->rf_power_state;



	switch (state_to_set) {

	case eRfOn:

	case rf_on:

		priv->rtllib->RfOffReason &= (~change_source);



		if ((change_source == RF_CHANGE_BY_HW) && priv->hw_radio_off)
@@ -179,13 +179,13 @@ bool rtl92e_set_rf_state(struct net_device *dev, 
			priv->rtllib->RfOffReason = 0;

			action_allowed = true;



			if (rt_state == eRfOff &&

			if (rt_state == rf_off &&

			    change_source >= RF_CHANGE_BY_HW)

				connect_by_ssid = true;

		}

		break;



	case eRfOff:

	case rf_off:



		if ((priv->rtllib->iw_mode == IW_MODE_INFRA) ||

		    (priv->rtllib->iw_mode == IW_MODE_ADHOC)) {
@@ -216,7 +216,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, 


	if (action_allowed) {

		rtl92e_set_rf_power_state(dev, state_to_set);

		if (state_to_set == eRfOn) {

		if (state_to_set == rf_on) {

			if (connect_by_ssid && priv->blinked_ingpio) {

				schedule_delayed_work(

					 &ieee->associate_procedure_wq, 0);
@@ -892,7 +892,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) 
	priv->rtllib->PowerSaveControl.bFwCtrlLPS = false;

	priv->rtllib->LPSDelayCnt = 0;

	priv->rtllib->sta_sleep = LPS_IS_WAKE;

	priv->rtllib->eRFPowerState = eRfOn;

	priv->rtllib->rf_power_state = rf_on;



	priv->rtllib->current_network.beacon_interval = DEFAULT_BEACONINTERVAL;

	priv->rtllib->iw_mode = IW_MODE_INFRA;
@@ -1114,12 +1114,12 @@ static enum reset_type _rtl92e_if_check_reset(struct net_device *dev) 
	enum reset_type RxResetType = RESET_TYPE_NORESET;

	enum rt_rf_power_state rfState;



	rfState = priv->rtllib->eRFPowerState;

	rfState = priv->rtllib->rf_power_state;



	if (rfState == eRfOn)

	if (rfState == rf_on)

		TxResetType = _rtl92e_tx_check_stuck(dev);



	if (rfState == eRfOn &&

	if (rfState == rf_on &&

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

	    (priv->rtllib->state == RTLLIB_LINKED))

		RxResetType = _rtl92e_rx_check_stuck(dev);
@@ -1307,7 +1307,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) 
	if (!rtllib_act_scanning(priv->rtllib, false)) {

		if ((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state ==

		     RTLLIB_NOLINK) &&

		     (ieee->eRFPowerState == eRfOn) && !ieee->is_set_key &&

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

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

			if ((ieee->PowerSaveControl.ReturnPoint ==

			     IPS_CALLBACK_NONE) &&
@@ -1370,7 +1370,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) 
			priv->check_roaming_cnt = 0;



		if (priv->check_roaming_cnt > 0) {

			if (ieee->eRFPowerState == eRfOff)

			if (ieee->rf_power_state == rf_off)

				netdev_info(dev, "%s(): RF is off\n", __func__);



			netdev_info(dev,
@@ -1507,7 +1507,7 @@ static void _rtl92e_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, 
				    MAX_DEV_ADDR_SIZE);

	u8 queue_index = tcb_desc->queue_index;



	if ((priv->rtllib->eRFPowerState == eRfOff) || !priv->up ||

	if ((priv->rtllib->rf_power_state == rf_off) || !priv->up ||

	     priv->bResetInProgress) {

		kfree_skb(skb);

		return;
@@ -1540,7 +1540,7 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	u8 queue_index = tcb_desc->queue_index;



	if (queue_index != TXCMD_QUEUE) {

		if ((priv->rtllib->eRFPowerState == eRfOff) ||

		if ((priv->rtllib->rf_power_state == rf_off) ||

		     !priv->up || priv->bResetInProgress) {

			kfree_skb(skb);

			return 0;