Skip to content

Commit

Permalink
starfire: 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_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 33b7a25 commit a7c48c7
Showing 1 changed file with 6 additions and 17 deletions.
23 changes: 6 additions & 17 deletions drivers/net/ethernet/adaptec/starfire.c
Original file line number Diff line number Diff line change
Expand Up @@ -1984,28 +1984,21 @@ static int netdev_close(struct net_device *dev)
return 0;
}

#ifdef CONFIG_PM
static int starfire_suspend(struct pci_dev *pdev, pm_message_t state)
static int __maybe_unused starfire_suspend(struct device *dev_d)
{
struct net_device *dev = pci_get_drvdata(pdev);
struct net_device *dev = dev_get_drvdata(dev_d);

if (netif_running(dev)) {
netif_device_detach(dev);
netdev_close(dev);
}

pci_save_state(pdev);
pci_set_power_state(pdev, pci_choose_state(pdev,state));

return 0;
}

static int starfire_resume(struct pci_dev *pdev)
static int __maybe_unused starfire_resume(struct device *dev_d)
{
struct net_device *dev = pci_get_drvdata(pdev);

pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
struct net_device *dev = dev_get_drvdata(dev_d);

if (netif_running(dev)) {
netdev_open(dev);
Expand All @@ -2014,8 +2007,6 @@ static int starfire_resume(struct pci_dev *pdev)

return 0;
}
#endif /* CONFIG_PM */


static void starfire_remove_one(struct pci_dev *pdev)
{
Expand All @@ -2040,15 +2031,13 @@ static void starfire_remove_one(struct pci_dev *pdev)
free_netdev(dev); /* Will also free np!! */
}

static SIMPLE_DEV_PM_OPS(starfire_pm_ops, starfire_suspend, starfire_resume);

static struct pci_driver starfire_driver = {
.name = DRV_NAME,
.probe = starfire_init_one,
.remove = starfire_remove_one,
#ifdef CONFIG_PM
.suspend = starfire_suspend,
.resume = starfire_resume,
#endif /* CONFIG_PM */
.driver.pm = &starfire_pm_ops,
.id_table = starfire_pci_tbl,
};

Expand Down

0 comments on commit a7c48c7

Please sign in to comment.