Commit 2937a5d2 authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: MgntActSet_RF_State: remove ProtectOrNot parameter 



It is set at the very beginning of function to a constant value.

Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2d4d4e1

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+3 −5
Original line number Diff line number Diff line
@@ -882,19 +882,17 @@ bool rtl92e_start_adapter(struct net_device *dev) 
		RT_TRACE((COMP_INIT | COMP_RF | COMP_POWER),

			  "%s(): Turn off RF for RegRfOff ----------\n",

			  __func__);

		rtl92e_set_rf_state(dev, eRfOff, RF_CHANGE_BY_SW, true);

		rtl92e_set_rf_state(dev, eRfOff, RF_CHANGE_BY_SW);

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

		RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER),

			 "%s(): Turn off RF for RfOffReason(%d) ----------\n",

			 __func__, priv->rtllib->RfOffReason);

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

				    true);

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

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

		RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER),

			 "%s(): Turn off RF for RfOffReason(%d) ----------\n",

			 __func__, priv->rtllib->RfOffReason);

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

				    true);

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

	} else {

		RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): RF-ON\n",

			  __func__);

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+26 −34
Original line number Diff line number Diff line
@@ -149,8 +149,7 @@ void rtl92e_writew(struct net_device *dev, int x, u16 y) 
*****************************************************************************/

bool rtl92e_set_rf_state(struct net_device *dev,

			 enum rt_rf_power_state StateToSet,

			 RT_RF_CHANGE_SOURCE ChangeSource,

			 bool	ProtectOrNot)

			 RT_RF_CHANGE_SOURCE ChangeSource)

{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rtllib_device *ieee = priv->rtllib;
@@ -163,10 +162,6 @@ bool rtl92e_set_rf_state(struct net_device *dev, 
	RT_TRACE((COMP_PS | COMP_RF),

		 "===>rtl92e_set_rf_state(): StateToSet(%d)\n", StateToSet);



	ProtectOrNot = false;





	if (!ProtectOrNot) {

	while (true) {

		spin_lock_irqsave(&priv->rf_ps_lock, flag);

		if (priv->RFChangeInProgress) {
@@ -195,7 +190,6 @@ bool rtl92e_set_rf_state(struct net_device *dev, 
			break;

		}

	}

	}



	rtState = priv->rtllib->eRFPowerState;
@@ -270,11 +264,9 @@ bool rtl92e_set_rf_state(struct net_device *dev, 
			 StateToSet, ChangeSource, priv->rtllib->RfOffReason);

	}



	if (!ProtectOrNot) {

	spin_lock_irqsave(&priv->rf_ps_lock, flag);

	priv->RFChangeInProgress = false;

	spin_unlock_irqrestore(&priv->rf_ps_lock, flag);

	}



	RT_TRACE((COMP_PS | COMP_RF), "<===rtl92e_set_rf_state()\n");

	return bActionAllowed;

drivers/staging/rtl8192e/rtl8192e/rtl_core.h

+1 −2
Original line number Diff line number Diff line
@@ -617,6 +617,5 @@ bool rtl92e_disable_nic(struct net_device *dev); 


bool rtl92e_set_rf_state(struct net_device *dev,

			 enum rt_rf_power_state StateToSet,

			 RT_RF_CHANGE_SOURCE ChangeSource,

			 bool	ProtectOrNot);

			 RT_RF_CHANGE_SOURCE ChangeSource);

#endif

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+1 −2
Original line number Diff line number Diff line
@@ -1888,8 +1888,7 @@ static void dm_CheckRfCtrlGPIO(void *data) 
	if (bActuallySet) {

		mdelay(1000);

		priv->bHwRfOffAction = 1;

		rtl92e_set_rf_state(dev, eRfPowerStateToSet, RF_CHANGE_BY_HW,

				    true);

		rtl92e_set_rf_state(dev, eRfPowerStateToSet, RF_CHANGE_BY_HW);

		if (priv->bHwRadioOff)

			argv[1] = "RFOFF";

		else

drivers/staging/rtl8192e/rtl8192e/rtl_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int rtl92e_suspend(struct pci_dev *pdev, pm_message_t state) 
	netif_device_detach(dev);



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

		rtl92e_set_rf_state(dev, eRfOff, RF_CHANGE_BY_INIT, true);

		rtl92e_set_rf_state(dev, eRfOff, RF_CHANGE_BY_INIT);

		ulRegRead = rtl92e_readl(dev, CPU_GEN);

		ulRegRead |= CPU_GEN_SYSTEM_RESET;

		rtl92e_writel(dev, CPU_GEN, ulRegRead);
@@ -108,7 +108,7 @@ int rtl92e_resume(struct pci_dev *pdev) 
		dev->netdev_ops->ndo_open(dev);



	if (!priv->rtllib->bSupportRemoteWakeUp)

		rtl92e_set_rf_state(dev, eRfOn, RF_CHANGE_BY_INIT, true);

		rtl92e_set_rf_state(dev, eRfOn, RF_CHANGE_BY_INIT);



out:

	RT_TRACE(COMP_POWER, "<================r8192E resume call.\n");