orinoco: use generic power management

With the support of generic PM callbacks, drivers no longer need to use
legacy .suspend() and .resume() in which they had to maintain PCI states
changes and device's power state themselves. The required operations are
done by PCI core.

PCI drivers are not expected to invoke PCI helper functions like
pci_save/restore_state(), pci_enable/disable_device(),
pci_set_power_state(), etc. Their tasks are completed by PCI core itself.

Compile-tested only.

Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200624174048.64754-1-vaibhavgupta40@gmail.com

diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c b/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c
index 048693b6c6c24f06e701a2fa5856484c228065a6..96a03d10a08020a92f9d85cc10c8f2439c89ea8d 100644 (file)
--- a/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c
+++ b/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c
@@ -290,8 +290,7 @@ static struct pci_driver orinoco_nortel_driver = {
        .id_table       = orinoco_nortel_id_table,
        .probe          = orinoco_nortel_init_one,
        .remove         = orinoco_nortel_remove_one,
-       .suspend        = orinoco_pci_suspend,
-       .resume         = orinoco_pci_resume,
+       .driver.pm      = &orinoco_pci_pm_ops,
 };
 
 static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION

diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_pci.c b/drivers/net/wireless/intersil/orinoco/orinoco_pci.c
index 4938a2208a37ce72371f245c78cf9de7d3c90345..f3c86b07b1b9200b61c4e7f34114adbda17df9d3 100644 (file)
--- a/drivers/net/wireless/intersil/orinoco/orinoco_pci.c
+++ b/drivers/net/wireless/intersil/orinoco/orinoco_pci.c
@@ -230,8 +230,7 @@ static struct pci_driver orinoco_pci_driver = {
        .id_table       = orinoco_pci_id_table,
        .probe          = orinoco_pci_init_one,
        .remove         = orinoco_pci_remove_one,
-       .suspend        = orinoco_pci_suspend,
-       .resume         = orinoco_pci_resume,
+       .driver.pm      = &orinoco_pci_pm_ops,
 };
 
 static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION

diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_pci.h b/drivers/net/wireless/intersil/orinoco/orinoco_pci.h
index 43f5b9f5a0b0a5078a1d36c723de318bb62725c9..d49d940864b4107704efc47832443489f546db9c 100644 (file)
--- a/drivers/net/wireless/intersil/orinoco/orinoco_pci.h
+++ b/drivers/net/wireless/intersil/orinoco/orinoco_pci.h
@@ -18,51 +18,37 @@ struct orinoco_pci_card {
        void __iomem *attr_io;
 };
 
-#ifdef CONFIG_PM
-static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+static int __maybe_unused orinoco_pci_suspend(struct device *dev_d)
 {
+       struct pci_dev *pdev = to_pci_dev(dev_d);
        struct orinoco_private *priv = pci_get_drvdata(pdev);
 
        orinoco_down(priv);
        free_irq(pdev->irq, priv);
-       pci_save_state(pdev);
-       pci_disable_device(pdev);
-       pci_set_power_state(pdev, PCI_D3hot);
 
        return 0;
 }
 
-static int orinoco_pci_resume(struct pci_dev *pdev)
+static int __maybe_unused orinoco_pci_resume(struct device *dev_d)
 {
+       struct pci_dev *pdev = to_pci_dev(dev_d);
        struct orinoco_private *priv = pci_get_drvdata(pdev);
        struct net_device *dev = priv->ndev;
        int err;
 
-       pci_set_power_state(pdev, PCI_D0);
-       err = pci_enable_device(pdev);
-       if (err) {
-               printk(KERN_ERR "%s: pci_enable_device failed on resume\n",
-                      dev->name);
-               return err;
-       }
-       pci_restore_state(pdev);
-
        err = request_irq(pdev->irq, orinoco_interrupt, IRQF_SHARED,
                          dev->name, priv);
        if (err) {
                printk(KERN_ERR "%s: cannot re-allocate IRQ on resume\n",
                       dev->name);
-               pci_disable_device(pdev);
                return -EBUSY;
        }
 
-       err = orinoco_up(priv);
-
-       return err;
+       return orinoco_up(priv);
 }
-#else
-#define orinoco_pci_suspend NULL
-#define orinoco_pci_resume NULL
-#endif
+
+static SIMPLE_DEV_PM_OPS(orinoco_pci_pm_ops,
+                        orinoco_pci_suspend,
+                        orinoco_pci_resume);
 
 #endif /* _ORINOCO_PCI_H */

diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_plx.c b/drivers/net/wireless/intersil/orinoco/orinoco_plx.c
index 221352027779f75c5ceb0e605b15297e53b70c2f..16dada94c774f5d6dda1236545814c97e66b1d11 100644 (file)
--- a/drivers/net/wireless/intersil/orinoco/orinoco_plx.c
+++ b/drivers/net/wireless/intersil/orinoco/orinoco_plx.c
@@ -336,8 +336,7 @@ static struct pci_driver orinoco_plx_driver = {
        .id_table       = orinoco_plx_id_table,
        .probe          = orinoco_plx_init_one,
        .remove         = orinoco_plx_remove_one,
-       .suspend        = orinoco_pci_suspend,
-       .resume         = orinoco_pci_resume,
+       .driver.pm      = &orinoco_pci_pm_ops,
 };
 
 static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION

diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c b/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c
index 20ce569b8a43d3e3b4dcba10f0f5f9f193a395de..9a9d335611ac35f0ca132159392f48c8c1eb276e 100644 (file)
--- a/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c
+++ b/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c
@@ -213,8 +213,7 @@ static struct pci_driver orinoco_tmd_driver = {
        .id_table       = orinoco_tmd_id_table,
        .probe          = orinoco_tmd_init_one,
        .remove         = orinoco_tmd_remove_one,
-       .suspend        = orinoco_pci_suspend,
-       .resume         = orinoco_pci_resume,
+       .driver.pm      = &orinoco_pci_pm_ops,
 };
 
 static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION