Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / brcm80211 / util / aiutils.c

diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/util/aiutils.c
index 75a7e3a5c0094023abf0eeea75e6a5ae40cfbaf2..ddd2f9d64c209137e940563f6e358973edc92475 100644 (file)
--- a/drivers/staging/brcm80211/util/aiutils.c
+++ b/drivers/staging/brcm80211/util/aiutils.c
@@ -14,11 +14,16 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <bcmdefs.h>
+#ifdef BRCM_FULLMAC
+#include <linux/netdevice.h>
+#endif
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <hndsoc.h>
@@ -26,8 +31,8 @@
 #include <pcicfg.h>
 #include <bcmdevs.h>
 
-#define BCM47162_DMP() ((CHIPID(sih->chip) == BCM47162_CHIP_ID) && \
-               (CHIPREV(sih->chiprev) == 0) && \
+#define BCM47162_DMP() ((sih->chip == BCM47162_CHIP_ID) && \
+               (sih->chiprev == 0) && \
                (sii->coreid[sii->curidx] == MIPS74K_CORE_ID))
 
 /* EROM parsing */
@@ -115,7 +120,7 @@ void ai_scan(si_t *sih, void *regs, uint devid)
 
        erombase = R_REG(sii->osh, &cc->eromptr);
 
-       switch (BUSTYPE(sih->bustype)) {
+       switch (sih->bustype) {
        case SI_BUS:
                eromptr = (u32 *) REG_MAP(erombase, SI_CORE_SIZE);
                break;
@@ -125,7 +130,7 @@ void ai_scan(si_t *sih, void *regs, uint devid)
                sii->curwrap = (void *)((unsigned long)regs + SI_CORE_SIZE);
 
                /* Now point the window at the erom */
-               OSL_PCI_WRITE_CONFIG(sii->osh, PCI_BAR0_WIN, 4, erombase);
+               pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN, erombase);
                eromptr = regs;
                break;
 
@@ -330,7 +335,7 @@ void *ai_setcoreidx(si_t *sih, uint coreidx)
        ASSERT((sii->intrsenabled_fn == NULL)
               || !(*(sii)->intrsenabled_fn) ((sii)->intr_arg));
 
-       switch (BUSTYPE(sih->bustype)) {
+       switch (sih->bustype) {
        case SI_BUS:
                /* map new one */
                if (!sii->regs[coreidx]) {
@@ -347,10 +352,10 @@ void *ai_setcoreidx(si_t *sih, uint coreidx)
 
        case PCI_BUS:
                /* point bar0 window */
-               OSL_PCI_WRITE_CONFIG(sii->osh, PCI_BAR0_WIN, 4, addr);
+               pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN, addr);
                regs = sii->curmap;
                /* point bar0 2nd 4KB window */
-               OSL_PCI_WRITE_CONFIG(sii->osh, PCI_BAR0_WIN2, 4, wrap);
+               pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN2, wrap);
                break;
 
 #ifdef BCMSDIO
@@ -504,7 +509,7 @@ uint ai_corereg(si_t *sih, uint coreidx, uint regoff, uint mask, uint val)
        if (coreidx >= SI_MAXCORES)
                return 0;
 
-       if (BUSTYPE(sih->bustype) == SI_BUS) {
+       if (sih->bustype == SI_BUS) {
                /* If internal bus, we can always get at everything */
                fast = true;
                /* map if does not exist */
@@ -514,7 +519,7 @@ uint ai_corereg(si_t *sih, uint coreidx, uint regoff, uint mask, uint val)
                        ASSERT(GOODREGS(sii->regs[coreidx]));
                }
                r = (u32 *) ((unsigned char *) sii->regs[coreidx] + regoff);
-       } else if (BUSTYPE(sih->bustype) == PCI_BUS) {
+       } else if (sih->bustype == PCI_BUS) {
                /* If pci/pcie, we can get at pci/pcie regs and on newer cores to chipc */
 
                if ((sii->coreid[coreidx] == CC_CORE_ID) && SI_FAST(sii)) {