UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

wireless: Convert mwifiex/pcie to dev_pm_ops from legacy pm_ops 

Convert the mwifiex/pci driver to use dev_pm_ops for power management and
remove Legacy PM handling. This change re-uses existing suspend and resume
interfaces for dev_pm_ops, and changes CONFIG_PM ifdefs to CONFIG_PM_SLEEP
as the driver does not support run-time PM.

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Acked-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Shuah Khan 2013-07-03 10:47:10 -06:00 committed by John W. Linville
parent ad81f0545e
commit 3266d73237
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/wireless/mwifiex/pcie.c
View File

@ -76,7 +76,7 @@ static bool mwifiex_pcie_ok_to_access_hw(struct mwifiex_adapter *adapter)
return false; return false;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
/* /*
* Kernel needs to suspend all functions separately. Therefore all * Kernel needs to suspend all functions separately. Therefore all
* registered functions must have drivers with suspend and resume * registered functions must have drivers with suspend and resume
@ -85,11 +85,12 @@ static bool mwifiex_pcie_ok_to_access_hw(struct mwifiex_adapter *adapter)
* If already not suspended, this function allocates and sends a host * If already not suspended, this function allocates and sends a host
* sleep activate request to the firmware and turns off the traffic. * sleep activate request to the firmware and turns off the traffic.
*/ */
static int mwifiex_pcie_suspend(struct pci_dev *pdev, pm_message_t state) static int mwifiex_pcie_suspend(struct device *dev)
{ {
struct mwifiex_adapter *adapter; struct mwifiex_adapter *adapter;
struct pcie_service_card *card; struct pcie_service_card *card;
int hs_actived; int hs_actived;
struct pci_dev *pdev = to_pci_dev(dev);
if (pdev) { if (pdev) {
card = (struct pcie_service_card *) pci_get_drvdata(pdev); card = (struct pcie_service_card *) pci_get_drvdata(pdev);
@ -120,10 +121,11 @@ static int mwifiex_pcie_suspend(struct pci_dev *pdev, pm_message_t state)
* If already not resumed, this function turns on the traffic and * If already not resumed, this function turns on the traffic and
* sends a host sleep cancel request to the firmware. * sends a host sleep cancel request to the firmware.
*/ */
static int mwifiex_pcie_resume(struct pci_dev *pdev) static int mwifiex_pcie_resume(struct device *dev)
{ {
struct mwifiex_adapter *adapter; struct mwifiex_adapter *adapter;
struct pcie_service_card *card; struct pcie_service_card *card;
struct pci_dev *pdev = to_pci_dev(dev);
if (pdev) { if (pdev) {
card = (struct pcie_service_card *) pci_get_drvdata(pdev); card = (struct pcie_service_card *) pci_get_drvdata(pdev);
@ -211,9 +213,9 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)
wait_for_completion(&adapter->fw_load); wait_for_completion(&adapter->fw_load);
if (user_rmmod) { if (user_rmmod) {
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
if (adapter->is_suspended) if (adapter->is_suspended)
mwifiex_pcie_resume(pdev); mwifiex_pcie_resume(&pdev->dev);
#endif #endif
for (i = 0; i < adapter->priv_num; i++) for (i = 0; i < adapter->priv_num; i++)
@ -249,16 +251,22 @@ static DEFINE_PCI_DEVICE_TABLE(mwifiex_ids) = {
MODULE_DEVICE_TABLE(pci, mwifiex_ids); MODULE_DEVICE_TABLE(pci, mwifiex_ids);
#ifdef CONFIG_PM_SLEEP
/* Power Management Hooks */
static SIMPLE_DEV_PM_OPS(mwifiex_pcie_pm_ops, mwifiex_pcie_suspend,
mwifiex_pcie_resume);
#endif
/* PCI Device Driver */ /* PCI Device Driver */
static struct pci_driver __refdata mwifiex_pcie = { static struct pci_driver __refdata mwifiex_pcie = {
.name = "mwifiex_pcie", .name = "mwifiex_pcie",
.id_table = mwifiex_ids, .id_table = mwifiex_ids,
.probe = mwifiex_pcie_probe, .probe = mwifiex_pcie_probe,
.remove = mwifiex_pcie_remove, .remove = mwifiex_pcie_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
/* Power Management Hooks */ .driver = {
.suspend = mwifiex_pcie_suspend, .pm = &mwifiex_pcie_pm_ops,
.resume = mwifiex_pcie_resume, },
#endif #endif
}; };