ath9k: use SIMPLE_DEV_PM_OPS
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 29 Nov 2012 22:27:15 +0000 (23:27 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 30 Nov 2012 19:00:35 +0000 (14:00 -0500)
ath9k does not provide any runtime pm callbacks, so support for
PM_RUNTIME is not needed and we could go to PM_SLEEP.
This also makes it possible to use SIMPLE_DEV_PM_OPS instead of
manually filling struct dev_pm_ops.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/pci.c

index 9553203ee6248dcd80fe9234902a61902fb6286a..8e9b826f878b423aa1ba0b587c926cf21da68b1e 100644 (file)
@@ -287,7 +287,7 @@ static void ath_pci_remove(struct pci_dev *pdev)
        pci_release_region(pdev, 0);
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 
 static int ath_pci_suspend(struct device *device)
 {
@@ -333,22 +333,15 @@ static int ath_pci_resume(struct device *device)
        return 0;
 }
 
-static const struct dev_pm_ops ath9k_pm_ops = {
-       .suspend = ath_pci_suspend,
-       .resume = ath_pci_resume,
-       .freeze = ath_pci_suspend,
-       .thaw = ath_pci_resume,
-       .poweroff = ath_pci_suspend,
-       .restore = ath_pci_resume,
-};
+static SIMPLE_DEV_PM_OPS(ath9k_pm_ops, ath_pci_suspend, ath_pci_resume);
 
 #define ATH9K_PM_OPS   (&ath9k_pm_ops)
 
-#else /* !CONFIG_PM */
+#else /* !CONFIG_PM_SLEEP */
 
 #define ATH9K_PM_OPS   NULL
 
-#endif /* !CONFIG_PM */
+#endif /* !CONFIG_PM_SLEEP */
 
 
 MODULE_DEVICE_TABLE(pci, ath_pci_id_table);