Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 000fe0f5 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: mac80211 conversion replace suspend resume functions 



add vt6655_suspend and vt6655_resume

remove viawget_suspend and viawget_resume.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d75b9e2

drivers/staging/vt6655/device_main.c

+34 −70
Original line number Diff line number Diff line
@@ -274,8 +274,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); 


#ifdef CONFIG_PM

static int device_notify_reboot(struct notifier_block *, unsigned long event, void *ptr);

static int viawget_suspend(struct pci_dev *pcid, pm_message_t state);

static int viawget_resume(struct pci_dev *pcid);

static struct notifier_block device_notifier = {

	.notifier_call = device_notify_reboot,

	.next = NULL,
@@ -3482,6 +3480,37 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) 


/*------------------------------------------------------------------*/



#ifdef CONFIG_PM

static int vt6655_suspend(struct pci_dev *pcid, pm_message_t state)

{

	struct vnt_private *priv = pci_get_drvdata(pcid);

	unsigned long flags;



	spin_lock_irqsave(&priv->lock, flags);



	pci_save_state(pcid);



	MACbShutdown(priv->PortOffset);



	pci_disable_device(pcid);

	pci_set_power_state(pcid, pci_choose_state(pcid, state));



	spin_unlock_irqrestore(&priv->lock, flags);



	return 0;

}



static int vt6655_resume(struct pci_dev *pcid)

{



	pci_set_power_state(pcid, PCI_D0);

	pci_enable_wake(pcid, PCI_D0, 0);

	pci_restore_state(pcid);



	return 0;

}

#endif



MODULE_DEVICE_TABLE(pci, vt6655_pci_id_table);



static struct pci_driver device_driver = {
@@ -3490,8 +3519,8 @@ static struct pci_driver device_driver = { 
	.probe = vt6655_probe,

	.remove = vt6655_remove,

#ifdef CONFIG_PM

	.suspend = viawget_suspend,

	.resume = viawget_resume,

	.suspend = vt6655_suspend,

	.resume = vt6655_resume,

#endif

};
@@ -3532,75 +3561,10 @@ device_notify_reboot(struct notifier_block *nb, unsigned long event, void *p) 
		for_each_pci_dev(pdev) {

			if (pci_dev_driver(pdev) == &device_driver) {

				if (pci_get_drvdata(pdev))

					viawget_suspend(pdev, PMSG_HIBERNATE);

					vt6655_suspend(pdev, PMSG_HIBERNATE);

			}

		}

	}

	return NOTIFY_DONE;

}



static int

viawget_suspend(struct pci_dev *pcid, pm_message_t state)

{

	int power_status;   // to silence the compiler



	struct vnt_private *pDevice = pci_get_drvdata(pcid);

	PSMgmtObject  pMgmt = pDevice->pMgmt;



	netif_stop_queue(pDevice->dev);

	spin_lock_irq(&pDevice->lock);

	pci_save_state(pcid);

	del_timer(&pDevice->sTimerCommand);

	del_timer(&pMgmt->sTimerSecondCallback);

	pDevice->cbFreeCmdQueue = CMD_Q_SIZE;

	pDevice->uCmdDequeueIdx = 0;

	pDevice->uCmdEnqueueIdx = 0;

	pDevice->bCmdRunning = false;

	MACbShutdown(pDevice->PortOffset);

	MACvSaveContext(pDevice->PortOffset, pDevice->abyMacContext);

	pDevice->bLinkPass = false;

	memset(pMgmt->abyCurrBSSID, 0, 6);

	pMgmt->eCurrState = WMAC_STATE_IDLE;

	pci_disable_device(pcid);

	power_status = pci_set_power_state(pcid, pci_choose_state(pcid, state));

	spin_unlock_irq(&pDevice->lock);

	return 0;

}



static int

viawget_resume(struct pci_dev *pcid)

{

	struct vnt_private *pDevice = pci_get_drvdata(pcid);

	PSMgmtObject  pMgmt = pDevice->pMgmt;

	int power_status;   // to silence the compiler



	power_status = pci_set_power_state(pcid, PCI_D0);

	power_status = pci_enable_wake(pcid, PCI_D0, 0);

	pci_restore_state(pcid);

	if (netif_running(pDevice->dev)) {

		spin_lock_irq(&pDevice->lock);

		MACvRestoreContext(pDevice->PortOffset, pDevice->abyMacContext);

		device_init_registers(pDevice);

		if (pMgmt->sNodeDBTable[0].bActive) { // Assoc with BSS

			pMgmt->sNodeDBTable[0].bActive = false;

			pDevice->bLinkPass = false;

			if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {

				// In Adhoc, BSS state set back to started.

				pMgmt->eCurrState = WMAC_STATE_STARTED;

			} else {

				pMgmt->eCurrMode = WMAC_MODE_STANDBY;

				pMgmt->eCurrState = WMAC_STATE_IDLE;

			}

		}

		init_timer(&pMgmt->sTimerSecondCallback);

		init_timer(&pDevice->sTimerCommand);

		MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);

		BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);

		bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, NULL);

		bScheduleCommand((void *)pDevice, WLAN_CMD_SSID, NULL);

		spin_unlock_irq(&pDevice->lock);

	}

	return 0;

}



#endif