Skip to content

Commit

Permalink
benet: use generic power management
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vaibhav Gupta authored and David S. Miller committed Jul 1, 2020
1 parent 78cad4c commit e9a7f8c
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions drivers/net/ethernet/emulex/benet/be_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -6037,32 +6037,23 @@ static int be_probe(struct pci_dev *pdev, const struct pci_device_id *pdev_id)
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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit e9a7f8c

Please sign in to comment.