Staging: brcm80211: remove unneeded pci macros

These wrapper macros aren't needed, remove them.

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index 0301c1f7e3f3ab290ad8ef7a8e50f60b1c364854..3e036b7c5a9a4d44b4f55413cfaa0770bf59428a 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/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/drivers/staging/brcm80211/include/linuxver.h b/drivers/staging/brcm80211/include/linuxver.h
index 190bdee065ab9c9e90dd0d0e93843732c6dababd..96de383af57ac0e594c10d525c60bdee91d0442d 100644 (file)
--- a/drivers/staging/brcm80211/include/linuxver.h
+++ b/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/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c
index 88c34fedb9367a090bdbb61e4eba71d052f34dfd..a2e5feb8aa9bb2445fadc3463fff2aae07cd49cf 100644 (file)
--- a/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/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;