Skip to content

Commit

Permalink
ena_netdev: 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.

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 a7c48c7 commit 817a89a
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions drivers/net/ethernet/amazon/ena/ena_netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -4420,13 +4420,12 @@ static void ena_shutdown(struct pci_dev *pdev)
__ena_shutoff(pdev, true);
}

#ifdef CONFIG_PM
/* ena_suspend - PM suspend callback
* @pdev: PCI device information struct
* @state:power state
* @dev_d: Device information struct
*/
static int ena_suspend(struct pci_dev *pdev, pm_message_t state)
static int __maybe_unused ena_suspend(struct device *dev_d)
{
struct pci_dev *pdev = to_pci_dev(dev_d);
struct ena_adapter *adapter = pci_get_drvdata(pdev);

u64_stats_update_begin(&adapter->syncp);
Expand All @@ -4445,12 +4444,11 @@ static int ena_suspend(struct pci_dev *pdev, pm_message_t state)
}

/* ena_resume - PM resume callback
* @pdev: PCI device information struct
*
* @dev_d: Device information struct
*/
static int ena_resume(struct pci_dev *pdev)
static int __maybe_unused ena_resume(struct device *dev_d)
{
struct ena_adapter *adapter = pci_get_drvdata(pdev);
struct ena_adapter *adapter = dev_get_drvdata(dev_d);
int rc;

u64_stats_update_begin(&adapter->syncp);
Expand All @@ -4462,18 +4460,16 @@ static int ena_resume(struct pci_dev *pdev)
rtnl_unlock();
return rc;
}
#endif

static SIMPLE_DEV_PM_OPS(ena_pm_ops, ena_suspend, ena_resume);

static struct pci_driver ena_pci_driver = {
.name = DRV_MODULE_NAME,
.id_table = ena_pci_tbl,
.probe = ena_probe,
.remove = ena_remove,
.shutdown = ena_shutdown,
#ifdef CONFIG_PM
.suspend = ena_suspend,
.resume = ena_resume,
#endif
.driver.pm = &ena_pm_ops,
.sriov_configure = pci_sriov_configure_simple,
};

Expand Down

0 comments on commit 817a89a

Please sign in to comment.