aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/brcm80211/sys
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-07 19:23:24 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-07 19:23:24 -0400
commit8ba9cfdbfc0fe3e84d150d66737210a34846e8a7 (patch)
treef20cc605ff2b193233701260ce52b7ec125842e4 /drivers/staging/brcm80211/sys
parent517b12f2a0d9f9e6de680b30242ec6432d2af7f7 (diff)
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>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
-rw-r--r--drivers/staging/brcm80211/sys/wl_mac80211.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c
index 88c34fedb93..a2e5feb8aa9 100644
--- 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)
1377 wl_down(wl); 1377 wl_down(wl);
1378 wl->pub->hw_up = FALSE; 1378 wl->pub->hw_up = FALSE;
1379 WL_UNLOCK(wl); 1379 WL_UNLOCK(wl);
1380 PCI_SAVE_STATE(pdev, wl->pci_psstate); 1380 pci_save_state(pdev, wl->pci_psstate);
1381 pci_disable_device(pdev); 1381 pci_disable_device(pdev);
1382 return pci_set_power_state(pdev, PCI_D3hot); 1382 return pci_set_power_state(pdev, PCI_D3hot);
1383} 1383}
@@ -1401,7 +1401,7 @@ static int wl_resume(struct pci_dev *pdev)
1401 if (err) 1401 if (err)
1402 return err; 1402 return err;
1403 1403
1404 PCI_RESTORE_STATE(pdev, wl->pci_psstate); 1404 pci_restore_state(pdev, wl->pci_psstate);
1405 1405
1406 err = pci_enable_device(pdev); 1406 err = pci_enable_device(pdev);
1407 if (err) 1407 if (err)
@@ -1498,7 +1498,7 @@ static int __init wl_module_init(void)
1498#endif /* BCMDBG */ 1498#endif /* BCMDBG */
1499 1499
1500#ifndef BCMSDIO 1500#ifndef BCMSDIO
1501 error = pci_module_init(&wl_pci_driver); 1501 error = pci_register_driver(&wl_pci_driver);
1502 if (!error) 1502 if (!error)
1503 return 0; 1503 return 0;
1504 1504