diff mbox

compat-wireless: make patches apply again

Message ID 1344886886-17983-1-git-send-email-hauke@hauke-m.de (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Hauke Mehrtens Aug. 13, 2012, 7:41 p.m. UTC 
Some parts of 11-dev-pm-ops.patch for iwlegacy went upstream in:
commit 450e9038ee65e3246b2a942669fc79001466f9be
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Tue Aug 7 21:46:44 2012 +0200

    iwlegacy: clean up suspend/resume

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/11-dev-pm-ops.patch |   30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

Comments

Luis Rodriguez Aug. 14, 2012, 1:30 a.m. UTC | #1 
On Mon, Aug 13, 2012 at 12:41 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> Some parts of 11-dev-pm-ops.patch for iwlegacy went upstream in:
> commit 450e9038ee65e3246b2a942669fc79001466f9be
> Author: Johannes Berg <johannes.berg@intel.com>
> Date:   Tue Aug 7 21:46:44 2012 +0200
>
>     iwlegacy: clean up suspend/resume
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

applied and pushed, thanks!!

  Luis
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index 411b2d5..15af08c 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -9,7 +9,7 @@  calls on compat code with only slight modifications.
 
 --- a/drivers/bcma/host_pci.c
 +++ b/drivers/bcma/host_pci.c
-@@ -256,6 +256,9 @@ static int bcma_host_pci_resume(struct d
+@@ -257,6 +257,9 @@ static int bcma_host_pci_resume(struct d
  	return bcma_bus_resume(bus);
  }
  
@@ -19,7 +19,7 @@  calls on compat code with only slight modifications.
  static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend,
  			 bcma_host_pci_resume);
  #define BCMA_PM_OPS	(&bcma_pm_ops)
-@@ -283,7 +286,12 @@ static struct pci_driver bcma_pci_bridge
+@@ -284,7 +287,12 @@ static struct pci_driver bcma_pci_bridge
  	.id_table = bcma_pci_bridge_tbl,
  	.probe = bcma_host_pci_probe,
  	.remove = __devexit_p(bcma_host_pci_remove),
@@ -109,7 +109,7 @@  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
-@@ -344,14 +344,10 @@ static int ath_pci_resume(struct device
+@@ -345,14 +345,10 @@ static int ath_pci_resume(struct device
  	return 0;
  }
  
@@ -128,7 +128,7 @@  calls on compat code with only slight modifications.
  
  #define ATH9K_PM_OPS	(&ath9k_pm_ops)
  
-@@ -369,7 +365,12 @@ static struct pci_driver ath_pci_driver
+@@ -370,7 +366,12 @@ static struct pci_driver ath_pci_driver
  	.id_table   = ath_pci_id_table,
  	.probe      = ath_pci_probe,
  	.remove     = ath_pci_remove,
@@ -173,22 +173,14 @@  calls on compat code with only slight modifications.
  static int __init
 --- a/drivers/net/wireless/iwlegacy/common.c
 +++ b/drivers/net/wireless/iwlegacy/common.c
-@@ -4908,15 +4908,17 @@ il_pci_resume(struct device *device)
+@@ -4906,8 +4906,17 @@ il_pci_resume(struct device *device)
+ 	return 0;
  }
- EXPORT_SYMBOL(il_pci_resume);
- 
--const struct dev_pm_ops il_pm_ops = {
--	.suspend = il_pci_suspend,
--	.resume = il_pci_resume,
--	.freeze = il_pci_suspend,
--	.thaw = il_pci_resume,
--	.poweroff = il_pci_suspend,
--	.restore = il_pci_resume,
--};
+ 
 +compat_pci_suspend(il_pci_suspend)
 +compat_pci_resume(il_pci_resume)
 +
-+SIMPLE_DEV_PM_OPS(il_pm_ops, il_pci_suspend, il_pci_resume);
+ SIMPLE_DEV_PM_OPS(il_pm_ops, il_pci_suspend, il_pci_resume);
 +
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
  EXPORT_SYMBOL(il_pm_ops);
@@ -201,10 +193,10 @@  calls on compat code with only slight modifications.
  
 --- a/drivers/net/wireless/iwlegacy/common.h
 +++ b/drivers/net/wireless/iwlegacy/common.h
-@@ -1847,7 +1847,14 @@ __le32 il_add_beacon_time(struct il_priv
+@@ -1845,7 +1845,14 @@ __le32 il_add_beacon_time(struct il_priv
+ 			  u32 beacon_interval);
+ 
  #ifdef CONFIG_PM
- int il_pci_suspend(struct device *device);
- int il_pci_resume(struct device *device);
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
 +int il_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state);
 +int il_pci_resume_compat(struct pci_dev *pdev);