|
@@ -659,7 +659,7 @@ static void __devexit p54p_remove(struct pci_dev *pdev)
|
|
|
p54_free_common(dev);
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_PM
|
|
|
+#ifdef CONFIG_PM_SLEEP
|
|
|
static int p54p_suspend(struct device *device)
|
|
|
{
|
|
|
struct pci_dev *pdev = to_pci_dev(device);
|
|
@@ -681,19 +681,12 @@ static int p54p_resume(struct device *device)
|
|
|
return pci_set_power_state(pdev, PCI_D0);
|
|
|
}
|
|
|
|
|
|
-static const struct dev_pm_ops p54pci_pm_ops = {
|
|
|
- .suspend = p54p_suspend,
|
|
|
- .resume = p54p_resume,
|
|
|
- .freeze = p54p_suspend,
|
|
|
- .thaw = p54p_resume,
|
|
|
- .poweroff = p54p_suspend,
|
|
|
- .restore = p54p_resume,
|
|
|
-};
|
|
|
+static SIMPLE_DEV_PM_OPS(p54pci_pm_ops, p54p_suspend, p54p_resume);
|
|
|
|
|
|
#define P54P_PM_OPS (&p54pci_pm_ops)
|
|
|
#else
|
|
|
#define P54P_PM_OPS (NULL)
|
|
|
-#endif /* CONFIG_PM */
|
|
|
+#endif /* CONFIG_PM_SLEEP */
|
|
|
|
|
|
static struct pci_driver p54p_driver = {
|
|
|
.name = "p54pci",
|