compat-drivers: fix 11-dev-pm-ops.patch

Hauke had sent out patches to help clean up
the pm run time callbacks to allow this patch
to be simplified. This takes care of the
required changes.

This goes compile tested against next-20121203

mcgrof@drvbp1 ~/devel/compat-drivers (git::master)$ time ckmake
Trying kernel 3.6.5-030605-generic [OK]
Trying kernel 3.5.7-030507-generic [OK]
Trying kernel 3.4.17-030417-generic [OK]
Trying kernel 3.3.8-030308-generic [OK]
Trying kernel 3.2.33-030233-generic [OK]
Trying kernel 3.1.10-030110-generic [OK]
Trying kernel 3.0.50-030050-generic [OK]
Trying kernel 2.6.39-02063904-generic [OK]
Trying kernel 2.6.38-02063808-generic [OK]
Trying kernel 2.6.37-02063706-generic [OK]
Trying kernel 2.6.36-02063604-generic [OK]
Trying kernel 2.6.35-02063513-generic [OK]
Trying kernel 2.6.34-02063413-generic [OK]
Trying kernel 2.6.33-02063320-generic [OK]
Trying kernel 2.6.32-02063260-generic [OK]
Trying kernel 2.6.31-02063113-generic [OK]
Trying kernel 2.6.30-02063010-generic [OK]
Trying kernel 2.6.29-02062906-generic [OK]
Trying kernel 2.6.28-02062810-generic [OK]
Trying kernel 2.6.27-020627-generic [OK]
Trying kernel 2.6.26-020626-generic [OK]
Trying kernel 2.6.25-020625-generic [OK]
Trying kernel 2.6.24-020624-generic [OK]

real    18m42.239s
user    327m50.029s
sys     53m37.317s

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

1 files changed, 30 insertions, 80 deletions

diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops.patch b/patches/collateral-evolutions/network/11-dev-pm-ops.patch
index 9001b52b..da66be6e 100644
--- a/patches/collateral-evolutions/network/11-dev-pm-ops.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops.patch
@@ -109,26 +109,17 @@ calls on compat code with only slight modifications.
  module_pci_driver(ath5k_pci_driver);
 --- a/drivers/net/wireless/ath/ath9k/pci.c
 +++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -333,14 +333,10 @@ static int ath_pci_resume(struct device
+@@ -333,6 +333,9 @@ static int ath_pci_resume(struct 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,
--};
-+compat_pci_suspend(ath_pci_suspend)
-+compat_pci_resume(ath_pci_resume)
++compat_pci_suspend(ath_pci_suspend);
++compat_pci_resume(ath_pci_resume);
 +
-+static SIMPLE_DEV_PM_OPS(ath9k_pm_ops, ath_pci_suspend, ath_pci_resume);
+ static SIMPLE_DEV_PM_OPS(ath9k_pm_ops, ath_pci_suspend, ath_pci_resume);
  
  #define ATH9K_PM_OPS	(&ath9k_pm_ops)
- 
-@@ -358,7 +354,12 @@ static struct pci_driver ath_pci_driver
+@@ -351,7 +354,12 @@ static struct pci_driver ath_pci_driver
  	.id_table   = ath_pci_id_table,
  	.probe      = ath_pci_probe,
  	.remove     = ath_pci_remove,
@@ -263,25 +254,17 @@ calls on compat code with only slight modifications.
  
 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
 +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
-@@ -372,21 +372,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
+@@ -372,6 +372,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
  MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
  MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
  
--static const struct dev_pm_ops rtlwifi_pm_ops = {
--	.suspend = rtl_pci_suspend,
--	.resume = rtl_pci_resume,
--	.freeze = rtl_pci_suspend,
--	.thaw = rtl_pci_resume,
--	.poweroff = rtl_pci_suspend,
--	.restore = rtl_pci_resume,
--};
-+compat_pci_suspend(rtl_pci_suspend)
-+compat_pci_resume(rtl_pci_resume)
++compat_pci_suspend(rtl_pci_suspend);
++compat_pci_resume(rtl_pci_resume);
 +
-+static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
+ static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
  
  static struct pci_driver rtl92ce_driver = {
- 	.name = KBUILD_MODNAME,
+@@ -379,7 +382,12 @@ static struct pci_driver rtl92ce_driver
  	.id_table = rtl92ce_pci_ids,
  	.probe = rtl_pci_probe,
  	.remove = rtl_pci_disconnect,
@@ -296,25 +279,17 @@ calls on compat code with only slight modifications.
  module_pci_driver(rtl92ce_driver);
 --- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
 +++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
-@@ -378,21 +378,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
+@@ -378,6 +378,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
  MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
  MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
  
--static const struct dev_pm_ops rtlwifi_pm_ops = {
--	.suspend = rtl_pci_suspend,
--	.resume = rtl_pci_resume,
--	.freeze = rtl_pci_suspend,
--	.thaw = rtl_pci_resume,
--	.poweroff = rtl_pci_suspend,
--	.restore = rtl_pci_resume,
--};
-+compat_pci_suspend(rtl_pci_suspend)
-+compat_pci_resume(rtl_pci_resume)
++compat_pci_suspend(rtl_pci_suspend);
++compat_pci_resume(rtl_pci_resume);
 +
-+static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
+ static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
  
  static struct pci_driver rtl92de_driver = {
- 	.name = KBUILD_MODNAME,
+@@ -385,7 +388,12 @@ static struct pci_driver rtl92de_driver
  	.id_table = rtl92de_pci_ids,
  	.probe = rtl_pci_probe,
  	.remove = rtl_pci_disconnect,
@@ -329,25 +304,17 @@ calls on compat code with only slight modifications.
  /* add global spin lock to solve the problem that
 --- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
 +++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
-@@ -432,21 +432,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
+@@ -429,6 +429,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
  MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
  MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
  
--static const struct dev_pm_ops rtlwifi_pm_ops = {
--	.suspend = rtl_pci_suspend,
--	.resume = rtl_pci_resume,
--	.freeze = rtl_pci_suspend,
--	.thaw = rtl_pci_resume,
--	.poweroff = rtl_pci_suspend,
--	.restore = rtl_pci_resume,
--};
-+compat_pci_suspend(rtl_pci_suspend)
-+compat_pci_resume(rtl_pci_resume)
++compat_pci_suspend(rtl_pci_suspend);
++compat_pci_resume(rtl_pci_resume);
 +
-+static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
+ static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
  
  static struct pci_driver rtl92se_driver = {
- 	.name = KBUILD_MODNAME,
+@@ -436,7 +439,12 @@ static struct pci_driver rtl92se_driver
  	.id_table = rtl92se_pci_ids,
  	.probe = rtl_pci_probe,
  	.remove = rtl_pci_disconnect,
@@ -362,25 +329,17 @@ calls on compat code with only slight modifications.
  module_pci_driver(rtl92se_driver);
 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
 +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
-@@ -367,21 +367,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
+@@ -367,6 +367,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
  MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
  MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
  
--static const struct dev_pm_ops rtlwifi_pm_ops = {
--	.suspend = rtl_pci_suspend,
--	.resume = rtl_pci_resume,
--	.freeze = rtl_pci_suspend,
--	.thaw = rtl_pci_resume,
--	.poweroff = rtl_pci_suspend,
--	.restore = rtl_pci_resume,
--};
-+compat_pci_suspend(rtl_pci_suspend)
-+compat_pci_resume(rtl_pci_resume)
++compat_pci_suspend(rtl_pci_suspend);
++compat_pci_resume(rtl_pci_resume);
 +
-+static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
+ static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
  
  static struct pci_driver rtl8723ae_driver = {
- 	.name = KBUILD_MODNAME,
+@@ -374,7 +377,12 @@ static struct pci_driver rtl8723ae_drive
  	.id_table = rtl8723ae_pci_ids,
  	.probe = rtl_pci_probe,
  	.remove = rtl_pci_disconnect,
@@ -395,26 +354,17 @@ calls on compat code with only slight modifications.
  module_pci_driver(rtl8723ae_driver);
 --- a/drivers/net/wireless/p54/p54pci.c
 +++ b/drivers/net/wireless/p54/p54pci.c
-@@ -681,14 +681,10 @@ static int p54p_resume(struct device *de
+@@ -681,6 +681,9 @@ static int p54p_resume(struct device *de
  	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,
--};
-+compat_pci_suspend(p54p_suspend)
-+compat_pci_resume(p54p_resume)
++compat_pci_suspend(p54p_suspend);
++compat_pci_resume(p54p_resume);
 +
-+static SIMPLE_DEV_PM_OPS(p54pci_pm_ops, p54p_suspend, p54p_resume);
+ static SIMPLE_DEV_PM_OPS(p54pci_pm_ops, p54p_suspend, p54p_resume);
  
  #define P54P_PM_OPS (&p54pci_pm_ops)
- #else
-@@ -700,7 +696,12 @@ static struct pci_driver p54p_driver = {
+@@ -693,7 +696,12 @@ static struct pci_driver p54p_driver = {
  	.id_table	= p54p_table,
  	.probe		= p54p_probe,
  	.remove		= __devexit_p(p54p_remove),