benet: use generic power management

With legacy PM, drivers themselves were responsible for managing the
device's power states and takes care of register states.

After upgrading to the generic structure, PCI core will take care of
required tasks and drivers should do only device-specific operations.

Thus, there is no need to call the PCI helper functions like
pci_enable/disable_device(), pci_save/restore_sate() and
pci_set_power_state().

Compile-tested only.

Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index a7ac23a6862b5c16cdc9e4d9966384dcaac05e61..e26f59336cfdd810459b6967de95e61fa134a4cb 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -6037,32 +6037,23 @@ do_none:
        return status;
 }
 
-static int be_suspend(struct pci_dev *pdev, pm_message_t state)
+static int __maybe_unused be_suspend(struct device *dev_d)
 {
-       struct be_adapter *adapter = pci_get_drvdata(pdev);
+       struct be_adapter *adapter = dev_get_drvdata(dev_d);
 
        be_intr_set(adapter, false);
        be_cancel_err_detection(adapter);
 
        be_cleanup(adapter);
 
-       pci_save_state(pdev);
-       pci_disable_device(pdev);
-       pci_set_power_state(pdev, pci_choose_state(pdev, state));
        return 0;
 }
 
-static int be_pci_resume(struct pci_dev *pdev)
+static int __maybe_unused be_pci_resume(struct device *dev_d)
 {
-       struct be_adapter *adapter = pci_get_drvdata(pdev);
+       struct be_adapter *adapter = dev_get_drvdata(dev_d);
        int status = 0;
 
-       status = pci_enable_device(pdev);
-       if (status)
-               return status;
-
-       pci_restore_state(pdev);
-
        status = be_resume(adapter);
        if (status)
                return status;
@@ -6234,13 +6225,14 @@ static const struct pci_error_handlers be_eeh_handlers = {
        .resume = be_eeh_resume,
 };
 
+static SIMPLE_DEV_PM_OPS(be_pci_pm_ops, be_suspend, be_pci_resume);
+
 static struct pci_driver be_driver = {
        .name = DRV_NAME,
        .id_table = be_dev_ids,
        .probe = be_probe,
        .remove = be_remove,
-       .suspend = be_suspend,
-       .resume = be_pci_resume,
+       .driver.pm = &be_pci_pm_ops,
        .shutdown = be_shutdown,
        .sriov_configure = be_pci_sriov_configure,
        .err_handler = &be_eeh_handlers