Commit f193f4eb authored by Vaibhav Gupta's avatar Vaibhav Gupta Committed by David S. Miller

sun/cassini: 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.

Compile-tested only.
Signed-off-by: default avatarVaibhav Gupta <vaibhavgupta40@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0db0cc2
...@@ -5172,10 +5172,9 @@ static void cas_remove_one(struct pci_dev *pdev) ...@@ -5172,10 +5172,9 @@ static void cas_remove_one(struct pci_dev *pdev)
pci_disable_device(pdev); pci_disable_device(pdev);
} }
#ifdef CONFIG_PM static int __maybe_unused cas_suspend(struct device *dev_d)
static int cas_suspend(struct pci_dev *pdev, pm_message_t state)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = dev_get_drvdata(dev_d);
struct cas *cp = netdev_priv(dev); struct cas *cp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
...@@ -5204,9 +5203,9 @@ static int cas_suspend(struct pci_dev *pdev, pm_message_t state) ...@@ -5204,9 +5203,9 @@ static int cas_suspend(struct pci_dev *pdev, pm_message_t state)
return 0; return 0;
} }
static int cas_resume(struct pci_dev *pdev) static int cas_resume(struct device *dev_d)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = dev_get_drvdata(dev_d);
struct cas *cp = netdev_priv(dev); struct cas *cp = netdev_priv(dev);
netdev_info(dev, "resuming\n"); netdev_info(dev, "resuming\n");
...@@ -5227,17 +5226,15 @@ static int cas_resume(struct pci_dev *pdev) ...@@ -5227,17 +5226,15 @@ static int cas_resume(struct pci_dev *pdev)
mutex_unlock(&cp->pm_mutex); mutex_unlock(&cp->pm_mutex);
return 0; return 0;
} }
#endif /* CONFIG_PM */
static SIMPLE_DEV_PM_OPS(cas_pm_ops, cas_suspend, cas_resume);
static struct pci_driver cas_driver = { static struct pci_driver cas_driver = {
.name = DRV_MODULE_NAME, .name = DRV_MODULE_NAME,
.id_table = cas_pci_tbl, .id_table = cas_pci_tbl,
.probe = cas_init_one, .probe = cas_init_one,
.remove = cas_remove_one, .remove = cas_remove_one,
#ifdef CONFIG_PM .driver.pm = &cas_pm_ops,
.suspend = cas_suspend,
.resume = cas_resume
#endif
}; };
static int __init cas_init(void) static int __init cas_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment