Commit 8bd890a4 authored by Larry Finger's avatar Larry Finger
Browse files

staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVIII 



Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent c73901c9

drivers/staging/rtl8192e/rtl_pm.c

+62 −74
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
int rtl8192E_save_state(struct pci_dev *dev, pm_message_t state)

{

	printk(KERN_NOTICE "r8192E save state call (state %u).\n", state.event);

	return(-EAGAIN);

	return -EAGAIN;

}
@@ -36,23 +36,19 @@ int rtl8192E_suspend (struct pci_dev *pdev, pm_message_t state) 
	struct r8192_priv *priv = rtllib_priv(dev);

	u32	ulRegRead;



        RT_TRACE(COMP_POWER, "============> r8192E suspend call.\n");

        printk("============> r8192E suspend call.\n");

	printk(KERN_INFO "============> r8192E suspend call.\n");

	del_timer_sync(&priv->gpio_polling_timer);

	cancel_delayed_work(&priv->gpio_change_rf_wq);

	priv->polling_timer_on = 0;



	if (!netif_running(dev)) {

            printk("RTL819XE:UI is open out of suspend function\n");

		printk(KERN_INFO "RTL819XE:UI is open out of suspend "

		       "function\n");

		goto out_pci_suspend;

	}



#ifdef HAVE_NET_DEVICE_OPS

	if (dev->netdev_ops->ndo_stop)

		dev->netdev_ops->ndo_stop(dev);

#else

	dev->stop(dev);

#endif

	netif_device_detach(dev);



	if (!priv->rtllib->bSupportRemoteWakeUp) {
@@ -68,14 +64,13 @@ int rtl8192E_suspend (struct pci_dev *pdev, pm_message_t state) 
		write_nic_byte(dev, MacBlkCtrl, 0xa);

	}

out_pci_suspend:

	RT_TRACE(COMP_POWER, "r8192E support WOL call??????????????????????\n");

	printk("r8192E support WOL call??????????????????????\n");

	if (priv->rtllib->bSupportRemoteWakeUp) {

		RT_TRACE(COMP_POWER, "r8192E support WOL call!!!!!!!!!!!!!!!!!!.\n");

	}

	if (priv->rtllib->bSupportRemoteWakeUp)

		RT_TRACE(COMP_POWER, "r8192E support WOL call!!!!!!!"

			 "!!!!!!!!!!!.\n");

	pci_save_state(pdev);

	pci_disable_device(pdev);

	pci_enable_wake(pdev, pci_choose_state(pdev,state),\

	pci_enable_wake(pdev, pci_choose_state(pdev, state),

			priv->rtllib->bSupportRemoteWakeUp ? 1 : 0);

	pci_set_power_state(pdev, pci_choose_state(pdev, state));
@@ -91,8 +86,7 @@ int rtl8192E_resume (struct pci_dev *pdev) 
	int err;

	u32 val;



    RT_TRACE(COMP_POWER, "================>r8192E resume call.");

    printk("================>r8192E resume call.\n");

	printk(KERN_INFO "================>r8192E resume call.\n");



	pci_set_power_state(pdev, PCI_D0);
@@ -105,32 +99,26 @@ int rtl8192E_resume (struct pci_dev *pdev) 
	pci_restore_state(pdev);



	pci_read_config_dword(pdev, 0x40, &val);

    if ((val & 0x0000ff00) != 0) {

	if ((val & 0x0000ff00) != 0)

		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);

    }



	pci_enable_wake(pdev, PCI_D0, 0);



    if (priv->polling_timer_on == 0){

	if (priv->polling_timer_on == 0)

		check_rfctrl_gpio_timer((unsigned long)dev);

    }



	if (!netif_running(dev)) {

        printk("RTL819XE:UI is open out of resume function\n");

		printk(KERN_INFO "RTL819XE:UI is open out of resume "

		       "function\n");

		goto out;

	}



	netif_device_attach(dev);

#ifdef HAVE_NET_DEVICE_OPS

	if (dev->netdev_ops->ndo_open)

		dev->netdev_ops->ndo_open(dev);

#else

    dev->open(dev);

#endif



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

	if (!priv->rtllib->bSupportRemoteWakeUp)

		MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_INIT, true);

    }



out:

	RT_TRACE(COMP_POWER, "<================r8192E resume call.\n");
@@ -142,7 +130,7 @@ int rtl8192E_enable_wake (struct pci_dev *dev, pm_message_t state, int enable) 
{

	printk(KERN_NOTICE "r8192E enable wake call (state %u, enable %d).\n",

	       state.event, enable);

	return(-EAGAIN);

	return -EAGAIN;

}



#endif

drivers/staging/rtl8192e/rtl_ps.c

+99 −85
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ void rtl8192_hw_sleep_down(struct net_device *dev) 
	spin_lock_irqsave(&priv->rf_ps_lock, flags);

	if (priv->RFChangeInProgress) {

		spin_unlock_irqrestore(&priv->rf_ps_lock, flags);

		RT_TRACE(COMP_DBG, "rtl8192_hw_sleep_down(): RF Change in progress! \n");

		RT_TRACE(COMP_DBG, "rtl8192_hw_sleep_down(): RF Change in "

			 "progress!\n");

		return;

	}

	spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
@@ -47,7 +48,8 @@ void rtl8192_hw_sleep_down(struct net_device *dev) 


void rtl8192_hw_sleep_wq(void *data)

{

	struct rtllib_device *ieee = container_of_dwork_rsl(data,struct rtllib_device,hw_sleep_wq);

	struct rtllib_device *ieee = container_of_dwork_rsl(data,

				     struct rtllib_device, hw_sleep_wq);

	struct net_device *dev = ieee->dev;

	rtl8192_hw_sleep_down(dev);

}
@@ -59,8 +61,10 @@ void rtl8192_hw_wakeup(struct net_device* dev) 
	spin_lock_irqsave(&priv->rf_ps_lock, flags);

	if (priv->RFChangeInProgress) {

		spin_unlock_irqrestore(&priv->rf_ps_lock, flags);

		RT_TRACE(COMP_DBG, "rtl8192_hw_wakeup(): RF Change in progress! \n");

		queue_delayed_work_rsl(priv->rtllib->wq,&priv->rtllib->hw_wakeup_wq,MSECS(10));

		RT_TRACE(COMP_DBG, "rtl8192_hw_wakeup(): RF Change in "

			 "progress!\n");

		queue_delayed_work_rsl(priv->rtllib->wq,

				       &priv->rtllib->hw_wakeup_wq, MSECS(10));

		return;

	}

	spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
@@ -70,7 +74,8 @@ void rtl8192_hw_wakeup(struct net_device* dev) 


void rtl8192_hw_wakeup_wq(void *data)

{

	struct rtllib_device *ieee = container_of_dwork_rsl(data,struct rtllib_device,hw_wakeup_wq);

	struct rtllib_device *ieee = container_of_dwork_rsl(data,

				     struct rtllib_device, hw_wakeup_wq);

	struct net_device *dev = ieee->dev;

	rtl8192_hw_wakeup(dev);
@@ -113,33 +118,33 @@ void rtl8192_hw_to_sleep(struct net_device *dev, u64 time) 
void InactivePsWorkItemCallback(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));

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					&(priv->rtllib->PowerSaveControl);



	RT_TRACE(COMP_PS, "InactivePsWorkItemCallback() --------->\n");

	pPSC->bSwRfProcessing = true;



	RT_TRACE(COMP_PS, "InactivePsWorkItemCallback(): Set RF to %s.\n", \

	RT_TRACE(COMP_PS, "InactivePsWorkItemCallback(): Set RF to %s.\n",

		 pPSC->eInactivePowerState == eRfOff ? "OFF" : "ON");

	MgntActSet_RF_State(dev, pPSC->eInactivePowerState, RF_CHANGE_BY_IPS,false);

	MgntActSet_RF_State(dev, pPSC->eInactivePowerState, RF_CHANGE_BY_IPS,

			    false);



	pPSC->bSwRfProcessing = false;

	RT_TRACE(COMP_PS, "InactivePsWorkItemCallback() <---------\n");

}



void

IPSEnter(struct net_device *dev)

void IPSEnter(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));

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					&(priv->rtllib->PowerSaveControl);

	enum rt_rf_power_state rtState;



	if (pPSC->bInactivePs)

	{

	if (pPSC->bInactivePs) {

		rtState = priv->rtllib->eRFPowerState;

		if (rtState == eRfOn && !pPSC->bSwRfProcessing &&\

			(priv->rtllib->state != RTLLIB_LINKED)&&\

			(priv->rtllib->iw_mode != IW_MODE_MASTER))

		{

		if (rtState == eRfOn && !pPSC->bSwRfProcessing &&

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

			(priv->rtllib->iw_mode != IW_MODE_MASTER)) {

			RT_TRACE(COMP_PS, "IPSEnter(): Turn off RF.\n");

			pPSC->eInactivePowerState = eRfOff;

			priv->isRFOff = true;
@@ -149,18 +154,17 @@ IPSEnter(struct net_device *dev) 
	}

}



void

IPSLeave(struct net_device *dev)

void IPSLeave(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));

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					&(priv->rtllib->PowerSaveControl);

	enum rt_rf_power_state rtState;



	if (pPSC->bInactivePs)

	{

	if (pPSC->bInactivePs) {

		rtState = priv->rtllib->eRFPowerState;

		if (rtState != eRfOn  && !pPSC->bSwRfProcessing && priv->rtllib->RfOffReason <= RF_CHANGE_BY_IPS)

		{

		if (rtState != eRfOn  && !pPSC->bSwRfProcessing &&

		    priv->rtllib->RfOffReason <= RF_CHANGE_BY_IPS) {

			RT_TRACE(COMP_PS, "IPSLeave(): Turn on RF.\n");

			pPSC->eInactivePowerState = eRfOn;

			priv->bInPowerSaveMode = false;
@@ -168,9 +172,11 @@ IPSLeave(struct net_device *dev) 
		}

	}

}



void IPSLeave_wq(void *data)

{

	struct rtllib_device *ieee = container_of_work_rsl(data,struct rtllib_device,ips_leave_wq);

	struct rtllib_device *ieee = container_of_work_rsl(data,

				     struct rtllib_device, ips_leave_wq);

	struct net_device *dev = ieee->dev;

	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);

	down(&priv->rtllib->ips_sem);
@@ -186,18 +192,20 @@ void rtllib_ips_leave_wq(struct net_device *dev) 


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

		if (rtState == eRfOff) {

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

			{

				RT_TRACE(COMP_ERR, "%s(): RF is OFF.\n",__func__);

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

				RT_TRACE(COMP_ERR, "%s(): RF is OFF.\n",

					 __func__);

				return;

			}

			else{

				printk("=========>%s(): IPSLeave\n",__func__);

				queue_work_rsl(priv->rtllib->wq,&priv->rtllib->ips_leave_wq);

			} else {

				printk(KERN_INFO "=========>%s(): IPSLeave\n",

				       __func__);

				queue_work_rsl(priv->rtllib->wq,

					       &priv->rtllib->ips_leave_wq);

			}

		}

	}

}



void rtllib_ips_leave(struct net_device *dev)

{

	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
@@ -214,10 +222,10 @@ bool MgntActSet_802_11_PowerSaveMode(struct net_device *dev, u8 rtPsMode) 
		return false;



	RT_TRACE(COMP_LPS, "%s(): set ieee->ps = %x\n", __func__, rtPsMode);

	if (!priv->ps_force) {

	if (!priv->ps_force)

		priv->rtllib->ps = rtPsMode;

	}

	if (priv->rtllib->sta_sleep != LPS_IS_WAKE && rtPsMode == RTLLIB_PS_DISABLED) {

	if (priv->rtllib->sta_sleep != LPS_IS_WAKE &&

	    rtPsMode == RTLLIB_PS_DISABLED) {

		unsigned long flags;



		rtl8192_hw_wakeup(dev);
@@ -233,18 +241,22 @@ bool MgntActSet_802_11_PowerSaveMode(struct net_device *dev, u8 rtPsMode) 
	return true;

}





void LeisurePSEnter(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));

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					&(priv->rtllib->PowerSaveControl);



	RT_TRACE(COMP_PS, "LeisurePSEnter()...\n");

	RT_TRACE(COMP_PS, "pPSC->bLeisurePs = %d, ieee->ps = %d,pPSC->LpsIdleCount is %d,RT_CHECK_FOR_HANG_PERIOD is %d\n",

		pPSC->bLeisurePs, priv->rtllib->ps,pPSC->LpsIdleCount,RT_CHECK_FOR_HANG_PERIOD);



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

	    || (priv->rtllib->iw_mode == IW_MODE_ADHOC) || (priv->rtllib->iw_mode == IW_MODE_MASTER))

	RT_TRACE(COMP_PS, "pPSC->bLeisurePs = %d, ieee->ps = %d,pPSC->LpsIdle"

		 "Count is %d,RT_CHECK_FOR_HANG_PERIOD is %d\n",

		 pPSC->bLeisurePs, priv->rtllib->ps, pPSC->LpsIdleCount,

		 RT_CHECK_FOR_HANG_PERIOD);



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

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

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

	    (priv->rtllib->iw_mode == IW_MODE_MASTER))

		return;



	if (pPSC->bLeisurePs) {
@@ -252,43 +264,45 @@ void LeisurePSEnter(struct net_device *dev) 


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



				RT_TRACE(COMP_LPS, "LeisurePSEnter(): Enter 802.11 power save mode...\n");

				RT_TRACE(COMP_LPS, "LeisurePSEnter(): Enter "

					 "802.11 power save mode...\n");



				if (!pPSC->bFwCtrlLPS) {

					if (priv->rtllib->SetFwCmdHandler)

						priv->rtllib->SetFwCmdHandler(dev, FW_CMD_LPS_ENTER);

						priv->rtllib->SetFwCmdHandler(

							dev, FW_CMD_LPS_ENTER);

				}

				MgntActSet_802_11_PowerSaveMode(dev, RTLLIB_PS_MBCAST|RTLLIB_PS_UNICAST);

				MgntActSet_802_11_PowerSaveMode(dev,

							 RTLLIB_PS_MBCAST |

							 RTLLIB_PS_UNICAST);

			}

		} else

			pPSC->LpsIdleCount++;

	}

}





void LeisurePSLeave(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));

	struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)

					&(priv->rtllib->PowerSaveControl);





	RT_TRACE(COMP_PS, "LeisurePSLeave()...\n");

	RT_TRACE(COMP_PS, "pPSC->bLeisurePs = %d, ieee->ps = %d\n",

		pPSC->bLeisurePs, priv->rtllib->ps);



	if (pPSC->bLeisurePs)

	{

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

		{

			RT_TRACE(COMP_LPS, "LeisurePSLeave(): Busy Traffic , Leave 802.11 power save..\n");

			MgntActSet_802_11_PowerSaveMode(dev, RTLLIB_PS_DISABLED);

	if (pPSC->bLeisurePs) {

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

			RT_TRACE(COMP_LPS, "LeisurePSLeave(): Busy Traffic , "

				 "Leave 802.11 power save..\n");

			MgntActSet_802_11_PowerSaveMode(dev,

					 RTLLIB_PS_DISABLED);



			if (!pPSC->bFwCtrlLPS)

			{

			if (!pPSC->bFwCtrlLPS) {

				if (priv->rtllib->SetFwCmdHandler)

				{

					priv->rtllib->SetFwCmdHandler(dev, FW_CMD_LPS_LEAVE);

				}

					priv->rtllib->SetFwCmdHandler(dev,

							 FW_CMD_LPS_LEAVE);

		    }

		}

	}

drivers/staging/rtl8192e/rtl_wx.c

+351 −403

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8192e/rtl_wx.h

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/rtl8192e/rtl_pm.h

+4 −4

File changed.

Contains only whitespace changes.

drivers/staging/rtl8192e/rtl_ps.h

+1 −1

File changed.

Contains only whitespace changes.