Skip to content

Commit

Permalink
tlan: use generic power management
Browse files Browse the repository at this point in the history
Drivers using legacy power management .suspen()/.resume() callbacks
have to manage PCI states and device's PM states themselves. They also
need to take care of standard configuration registers.

Switch to generic power management framework using a single
"struct dev_pm_ops" variable to take the unnecessary load from the driver.
This also avoids the need for the driver to directly call most of the PCI
helper functions and device power state control functions, as through
the generic framework PCI Core takes care of the necessary operations,
and drivers are required to do only device-specific jobs.

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 31, 2020
1 parent 7fa8bb4 commit 04db646
Showing 1 changed file with 6 additions and 25 deletions.
31 changes: 6 additions & 25 deletions drivers/net/ethernet/ti/tlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -345,33 +345,21 @@ static void tlan_stop(struct net_device *dev)
}
}

#ifdef CONFIG_PM

static int tlan_suspend(struct pci_dev *pdev, pm_message_t state)
static int __maybe_unused tlan_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))
tlan_stop(dev);

netif_device_detach(dev);
pci_save_state(pdev);
pci_disable_device(pdev);
pci_wake_from_d3(pdev, false);
pci_set_power_state(pdev, PCI_D3hot);

return 0;
}

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

if (rc)
return rc;
pci_restore_state(pdev);
pci_enable_wake(pdev, PCI_D0, 0);
struct net_device *dev = dev_get_drvdata(dev_d);
netif_device_attach(dev);

if (netif_running(dev))
Expand All @@ -380,21 +368,14 @@ static int tlan_resume(struct pci_dev *pdev)
return 0;
}

#else /* CONFIG_PM */

#define tlan_suspend NULL
#define tlan_resume NULL

#endif /* CONFIG_PM */

static SIMPLE_DEV_PM_OPS(tlan_pm_ops, tlan_suspend, tlan_resume);

static struct pci_driver tlan_driver = {
.name = "tlan",
.id_table = tlan_pci_tbl,
.probe = tlan_init_one,
.remove = tlan_remove_one,
.suspend = tlan_suspend,
.resume = tlan_resume,
.driver.pm = &tlan_pm_ops,
};

static int __init tlan_probe(void)
Expand Down

0 comments on commit 04db646

Please sign in to comment.