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

staging: rtl8192e: Rename eRfSleep, eRfPowerStateToSet and RfOffReason 



Rename variable eRfSleep to rf_sleep, eRfPowerStateToSet to
rf_power_state_to_set and RfOffReason to rf_off_reason to avoid CamelCase
which is not accepted by checkpatch. Omit the upfront "e" as no RfSleep
and RfPowerStateToSet 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/58e21e5cf86270edae93162db2395e6348c9c424.1664055213.git.philipp.g.hortmann@gmail.com


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

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+5 −5
Original line number Diff line number Diff line
@@ -758,13 +758,13 @@ bool rtl92e_start_adapter(struct net_device *dev) 


	if (priv->RegRfOff) {

		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, rf_off, priv->rtllib->RfOffReason);

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

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

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

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

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

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

	} else {

		priv->rtllib->rf_power_state = rf_on;

		priv->rtllib->RfOffReason = 0;

		priv->rtllib->rf_off_reason = 0;

	}



	if (priv->rtllib->FwRWRF)

drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c

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


			break;



		case eRfSleep:

		case rf_sleep:

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

				break;

drivers/staging/rtl8192e/rtl8192e/rtl_cam.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex, 
	rt_state = priv->rtllib->rf_power_state;

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

		if (rt_state == rf_off) {

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

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

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

					    __func__);

				return;

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+8 −8
Original line number Diff line number Diff line
@@ -170,13 +170,13 @@ bool rtl92e_set_rf_state(struct net_device *dev, 


	switch (state_to_set) {

	case rf_on:

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

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



		if ((change_source == RF_CHANGE_BY_HW) && priv->hw_radio_off)

			priv->hw_radio_off = false;



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

			priv->rtllib->RfOffReason = 0;

		if (!priv->rtllib->rf_off_reason) {

			priv->rtllib->rf_off_reason = 0;

			action_allowed = true;



			if (rt_state == rf_off &&
@@ -189,7 +189,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, 


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

		    (priv->rtllib->iw_mode == IW_MODE_ADHOC)) {

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

			if ((priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) ||

			    (change_source > RF_CHANGE_BY_IPS)) {

				if (ieee->state == RTLLIB_LINKED)

					priv->blinked_ingpio = true;
@@ -201,12 +201,12 @@ bool rtl92e_set_rf_state(struct net_device *dev, 
		}

		if ((change_source == RF_CHANGE_BY_HW) && !priv->hw_radio_off)

			priv->hw_radio_off = true;

		priv->rtllib->RfOffReason |= change_source;

		priv->rtllib->rf_off_reason |= change_source;

		action_allowed = true;

		break;



	case eRfSleep:

		priv->rtllib->RfOffReason |= change_source;

	case rf_sleep:

		priv->rtllib->rf_off_reason |= change_source;

		action_allowed = true;

		break;
@@ -882,7 +882,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) 
	priv->RegRfOff = false;

	priv->isRFOff = false;

	priv->bInPowerSaveMode = false;

	priv->rtllib->RfOffReason = 0;

	priv->rtllib->rf_off_reason = 0;

	priv->rf_change_in_progress = false;

	priv->bHwRfOffAction = 0;

	priv->SetRFPowerStateInProgress = false;

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+5 −5
Original line number Diff line number Diff line
@@ -1665,7 +1665,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) 
				  struct r8192_priv, gpio_change_rf_wq);

	struct net_device *dev = priv->rtllib->dev;

	u8 tmp1byte;

	enum rt_rf_power_state eRfPowerStateToSet;

	enum rt_rf_power_state rf_power_state_to_set;

	bool bActuallySet = false;

	char *argv[3];

	static const char RadioPowerPath[] = "/etc/acpi/events/RadioPower.sh";
@@ -1684,13 +1684,13 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) 


	tmp1byte = rtl92e_readb(dev, GPI);



	eRfPowerStateToSet = (tmp1byte&BIT1) ?  rf_on : rf_off;

	rf_power_state_to_set = (tmp1byte&BIT1) ?  rf_on : rf_off;



	if (priv->hw_radio_off && (eRfPowerStateToSet == rf_on)) {

	if (priv->hw_radio_off && (rf_power_state_to_set == rf_on)) {

		netdev_info(dev, "gpiochangeRF  - HW Radio ON\n");

		priv->hw_radio_off = false;

		bActuallySet = true;

	} else if (!priv->hw_radio_off && (eRfPowerStateToSet == rf_off)) {

	} else if (!priv->hw_radio_off && (rf_power_state_to_set == rf_off)) {

		netdev_info(dev, "gpiochangeRF  - HW Radio OFF\n");

		priv->hw_radio_off = true;

		bActuallySet = true;
@@ -1699,7 +1699,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) 
	if (bActuallySet) {

		mdelay(1000);

		priv->bHwRfOffAction = 1;

		rtl92e_set_rf_state(dev, eRfPowerStateToSet, RF_CHANGE_BY_HW);

		rtl92e_set_rf_state(dev, rf_power_state_to_set, RF_CHANGE_BY_HW);

		if (priv->hw_radio_off)

			argv[1] = "RFOFF";

		else