staging: rtl8192e: use generic power management

The structure of working of PM hooks for source files is:
    drivers/staging/rtl8192e/rtl8192e/rtl_pm.h   : callbacks declared
    drivers/staging/rtl8192e/rtl8192e/rtl_pm.c   : callbacks defined
    drivers/staging/rtl8192e/rtl8192e/rtl_core.c : callbacks used

Drivers should not use legacy power management as they have to manage power
states and related operations, for the device, themselves. This driver was
handling them with the help of PCI helper functions like
pci_save/restore_state(), pci_enable/disable_device(), etc.

With generic PM, all essentials will be handled by the PCI core. Driver
needs to do only device-specific operations.

The driver was also using pci_enable_wake(...,..., 0) to disable wake. Use
device_wakeup_disable() instead. Use device_set_wakeup_enable() where WOL
is decided by the value of a variable during runtime.

Compile-tested only.

Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Link: https://lore.kernel.org/r/20200629082819.216405-3-vaibhavgupta40@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index a7cd4de65b2856ce15630180dab54d2cc3fdb798..dbcb8d0d9707d2c9d855604b43ce324f7314f227 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -63,13 +63,14 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev,
 static void _rtl92e_pci_disconnect(struct pci_dev *pdev);
 static irqreturn_t _rtl92e_irq(int irq, void *netdev);
 
+static SIMPLE_DEV_PM_OPS(rtl92e_pm_ops, rtl92e_suspend, rtl92e_resume);
+
 static struct pci_driver rtl8192_pci_driver = {
        .name = DRV_NAME,       /* Driver name   */
        .id_table = rtl8192_pci_id_tbl, /* PCI_ID table  */
        .probe  = _rtl92e_pci_probe,    /* probe fn      */
        .remove  = _rtl92e_pci_disconnect,      /* remove fn */
-       .suspend = rtl92e_suspend,      /* PM suspend fn */
-       .resume = rtl92e_resume,                 /* PM resume fn  */
+       .driver.pm = &rtl92e_pm_ops,
 };
 
 static short _rtl92e_is_tx_queue_empty(struct net_device *dev);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
index cd3e17b41d6fe9ddc88c43512ba3ec4c27a55e7c..5575186caebddd1d166765762c62914bce048179 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
@@ -10,9 +10,9 @@
 #include "rtl_pm.h"
 
 
-int rtl92e_suspend(struct pci_dev *pdev, pm_message_t state)
+int rtl92e_suspend(struct device *dev_d)
 {
-       struct net_device *dev = pci_get_drvdata(pdev);
+       struct net_device *dev = dev_get_drvdata(dev_d);
        struct r8192_priv *priv = rtllib_priv(dev);
        u32     ulRegRead;
 
@@ -46,40 +46,28 @@ int rtl92e_suspend(struct pci_dev *pdev, pm_message_t state)
 out_pci_suspend:
        netdev_info(dev, "WOL is %s\n", priv->rtllib->bSupportRemoteWakeUp ?
                            "Supported" : "Not supported");
-       pci_save_state(pdev);
-       pci_disable_device(pdev);
-       pci_enable_wake(pdev, pci_choose_state(pdev, state),
-                       priv->rtllib->bSupportRemoteWakeUp ? 1 : 0);
-       pci_set_power_state(pdev, pci_choose_state(pdev, state));
+       device_set_wakeup_enable(dev_d, priv->rtllib->bSupportRemoteWakeUp);
 
        mdelay(20);
 
        return 0;
 }
 
-int rtl92e_resume(struct pci_dev *pdev)
+int rtl92e_resume(struct device *dev_d)
 {
-       struct net_device *dev = pci_get_drvdata(pdev);
+       struct pci_dev *pdev = to_pci_dev(dev_d);
+       struct net_device *dev = dev_get_drvdata(dev_d);
        struct r8192_priv *priv = rtllib_priv(dev);
-       int err;
        u32 val;
 
        netdev_info(dev, "================>r8192E resume call.\n");
 
-       pci_set_power_state(pdev, PCI_D0);
-
-       err = pci_enable_device(pdev);
-       if (err) {
-               netdev_err(dev, "pci_enable_device failed on resume\n");
-               return err;
-       }
-       pci_restore_state(pdev);
 
        pci_read_config_dword(pdev, 0x40, &val);
        if ((val & 0x0000ff00) != 0)
                pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
 
-       pci_enable_wake(pdev, PCI_D0, 0);
+       device_wakeup_disable(dev_d);
 
        if (priv->polling_timer_on == 0)
                rtl92e_check_rfctrl_gpio_timer(&priv->gpio_polling_timer);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h
index e58f2bcdb1ddc7ac090701f2f26267802d085a34..fd86114959753fbe12fb8415edca21ac522aff78 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h
@@ -10,7 +10,7 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 
-int rtl92e_suspend(struct pci_dev *dev, pm_message_t state);
-int rtl92e_resume(struct pci_dev *dev);
+int rtl92e_suspend(struct device *dev_d);
+int rtl92e_resume(struct device *dev_d);
 
 #endif