From 4685ed635471d8aa5776a0d8cddff8179e2c5645 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 7 Oct 2010 16:23:24 -0700
Subject: [PATCH] --- yaml --- r: 220159 b: refs/heads/master c:
 8ba9cfdbfc0fe3e84d150d66737210a34846e8a7 h: refs/heads/master i:   220157:
 52ad6be7c64f819fd1daa6cbe6e0794e43a9b365   220155:
 4c0a771a80d61e0b741b92e2e10728ce2e6c7742   220151:
 5fda33c0529cdb7cf08e43090b2f4770736bde8e   220143:
 6bad25b6a539a10297fa32b2cdb8ffa791fe0e48   220127:
 4eba29e277a477346c7d39559446ddb78d943f46   220095:
 18ba26e01d0e0f72b775eacdcdf0914dd6d0fd6b   220031:
 43665b245f5e4d33e57a6dd41924b67beb6c6ce0   219903:
 6154a6d89429913def429868869a7fa44160349a   219647:
 991ee1ab4022a70f518c9ca9c41fc031babe3019   219135:
 0eda1b00caf478aa3cb52937339783f06171e750 v: v3

---
 [refs]                                                  | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 2 +-
 trunk/drivers/staging/brcm80211/include/linuxver.h      | 6 ------
 trunk/drivers/staging/brcm80211/sys/wl_mac80211.c       | 6 +++---
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index d2dbd8ea4ded..fe78b29f96bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 517b12f2a0d9f9e6de680b30242ec6432d2af7f7
+refs/heads/master: 8ba9cfdbfc0fe3e84d150d66737210a34846e8a7
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index 0301c1f7e3f3..3e036b7c5a9a 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -540,7 +540,7 @@ int bcmsdh_register(bcmsdh_driver_t *driver)
 	if (!error)
 		return 0;
 
-	SDLX_MSG(("%s: pci_module_init failed 0x%x\n", __func__, error));
+	SDLX_MSG(("%s: pci_register_driver failed 0x%x\n", __func__, error));
 #endif				/* BCMPLATFORM_BUS */
 
 	return error;
diff --git a/trunk/drivers/staging/brcm80211/include/linuxver.h b/trunk/drivers/staging/brcm80211/include/linuxver.h
index 190bdee065ab..96de383af57a 100644
--- a/trunk/drivers/staging/brcm80211/include/linuxver.h
+++ b/trunk/drivers/staging/brcm80211/include/linuxver.h
@@ -55,14 +55,8 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs * ptregs);
 #define __devexit_p(x)	x
 #endif
 
-#define pci_module_init pci_register_driver
-
 #define netif_down(dev)
 
-/* Power management related macro & routines */
-#define	PCI_SAVE_STATE(a, b)	pci_save_state(a)
-#define	PCI_RESTORE_STATE(a, b)	pci_restore_state(a)
-
 /* suspend args */
 #define DRV_SUSPEND_STATE_TYPE pm_message_t
 
diff --git a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
index 88c34fedb936..a2e5feb8aa9b 100644
--- a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -1377,7 +1377,7 @@ static int wl_suspend(struct pci_dev *pdev, DRV_SUSPEND_STATE_TYPE state)
 	wl_down(wl);
 	wl->pub->hw_up = FALSE;
 	WL_UNLOCK(wl);
-	PCI_SAVE_STATE(pdev, wl->pci_psstate);
+	pci_save_state(pdev, wl->pci_psstate);
 	pci_disable_device(pdev);
 	return pci_set_power_state(pdev, PCI_D3hot);
 }
@@ -1401,7 +1401,7 @@ static int wl_resume(struct pci_dev *pdev)
 	if (err)
 		return err;
 
-	PCI_RESTORE_STATE(pdev, wl->pci_psstate);
+	pci_restore_state(pdev, wl->pci_psstate);
 
 	err = pci_enable_device(pdev);
 	if (err)
@@ -1498,7 +1498,7 @@ static int __init wl_module_init(void)
 #endif				/* BCMDBG */
 
 #ifndef BCMSDIO
-	error = pci_module_init(&wl_pci_driver);
+	error = pci_register_driver(&wl_pci_driver);
 	if (!error)
 		return 0;