1 files changed, 148 insertions, 174 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 22913af26db8..43ba0dd48354 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -91,7 +91,6 @@ struct rte_console {
 #include "dhd_bus.h"
 #include "dhd_proto.h"
 #include "dhd_dbg.h"
-#include <bcmchip.h>
 
 #define TXQLEN          2048    /* bulk tx queue length */
 #define TXHI            (TXQLEN - 256)  /* turn on flow control above TXHI */
@@ -310,6 +309,11 @@ struct rte_console {
 /* Flags for SDH calls */
 #define F2SYNC  (SDIO_REQ_4BYTE | SDIO_REQ_FIXED)
 
+#define BRCMFMAC_FW_NAME        "brcm/brcmfmac.bin"
+#define BRCMFMAC_NV_NAME        "brcm/brcmfmac.txt"
+MODULE_FIRMWARE(BRCMFMAC_FW_NAME);
+MODULE_FIRMWARE(BRCMFMAC_NV_NAME);
+
 /*
  * Conversion of 802.1D priority to precedence level
  */
@@ -445,7 +449,7 @@ struct sdpcm_shared_le {
 
 /* misc chip info needed by some of the routines */
 /* Private data for SDIO bus interaction */
-struct brcmf_bus {
+struct brcmf_sdio {
         struct brcmf_pub *drvr;
 
         struct brcmf_sdio_dev *sdiodev; /* sdio device handler */
@@ -562,9 +566,7 @@ struct brcmf_bus {
 
         struct semaphore sdsem;
 
-        const char *fw_name;
         const struct firmware *firmware;
-        const char *nv_name;
         u32 fw_ptr;
 };
 
@@ -602,7 +604,7 @@ static void pkt_align(struct sk_buff *p, int len, int align)
 }
 
 /* To check if there's window offered */
-static bool data_ok(struct brcmf_bus *bus)
+static bool data_ok(struct brcmf_sdio *bus)
 {
         return (u8)(bus->tx_max - bus->tx_seq) != 0 &&
                ((u8)(bus->tx_max - bus->tx_seq) & 0x80) == 0;
@@ -613,7 +615,7 @@ static bool data_ok(struct brcmf_bus *bus)
  * adresses on the 32 bit backplane bus.
  */
 static void
-r_sdreg32(struct brcmf_bus *bus, u32 *regvar, u32 reg_offset, u32 *retryvar)
+r_sdreg32(struct brcmf_sdio *bus, u32 *regvar, u32 reg_offset, u32 *retryvar)
 {
         u8 idx = brcmf_sdio_chip_getinfidx(bus->ci, BCMA_CORE_SDIO_DEV);
         *retryvar = 0;
@@ -633,7 +635,7 @@ r_sdreg32(struct brcmf_bus *bus, u32 *regvar, u32 reg_offset, u32 *retryvar)
 }
 
 static void
-w_sdreg32(struct brcmf_bus *bus, u32 regval, u32 reg_offset, u32 *retryvar)
+w_sdreg32(struct brcmf_sdio *bus, u32 regval, u32 reg_offset, u32 *retryvar)
 {
         u8 idx = brcmf_sdio_chip_getinfidx(bus->ci, BCMA_CORE_SDIO_DEV);
         *retryvar = 0;
@@ -658,14 +660,14 @@ w_sdreg32(struct brcmf_bus *bus, u32 regval, u32 reg_offset, u32 *retryvar)
 /* Packet free applicable unconditionally for sdio and sdspi.
  * Conditional if bufpool was present for gspi bus.
  */
-static void brcmf_sdbrcm_pktfree2(struct brcmf_bus *bus, struct sk_buff *pkt)
+static void brcmf_sdbrcm_pktfree2(struct brcmf_sdio *bus, struct sk_buff *pkt)
 {
         if (bus->usebufpool)
                 brcmu_pkt_buf_free_skb(pkt);
 }
 
 /* Turn backplane clock on or off */
-static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
+static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok)
 {
         int err;
         u8 clkctl, clkreq, devctl;
@@ -786,7 +788,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
 }
 
 /* Change idle/active SD state */
-static int brcmf_sdbrcm_sdclk(struct brcmf_bus *bus, bool on)
+static int brcmf_sdbrcm_sdclk(struct brcmf_sdio *bus, bool on)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -799,7 +801,7 @@ static int brcmf_sdbrcm_sdclk(struct brcmf_bus *bus, bool on)
 }
 
 /* Transition SD and backplane clock readiness */
-static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok)
+static int brcmf_sdbrcm_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)
 {
 #ifdef BCMDBG
         uint oldstate = bus->clkstate;
@@ -855,7 +857,7 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok)
         return 0;
 }
 
-static int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)
+static int brcmf_sdbrcm_bussleep(struct brcmf_sdio *bus, bool sleep)
 {
         uint retries = 0;
 
@@ -927,13 +929,13 @@ static int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)
         return 0;
 }
 
-static void bus_wake(struct brcmf_bus *bus)
+static void bus_wake(struct brcmf_sdio *bus)
 {
         if (bus->sleeping)
                 brcmf_sdbrcm_bussleep(bus, false);
 }
 
-static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus)
+static u32 brcmf_sdbrcm_hostmail(struct brcmf_sdio *bus)
 {
         u32 intstatus = 0;
         u32 hmb_data;
@@ -1009,7 +1011,7 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus)
         return intstatus;
 }
 
-static void brcmf_sdbrcm_rxfail(struct brcmf_bus *bus, bool abort, bool rtx)
+static void brcmf_sdbrcm_rxfail(struct brcmf_sdio *bus, bool abort, bool rtx)
 {
         uint retries = 0;
         u16 lastrbc;
@@ -1066,11 +1068,11 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_bus *bus, bool abort, bool rtx)
 
         /* If we can't reach the device, signal failure */
         if (err || brcmf_sdcard_regfail(bus->sdiodev))
-                bus->drvr->busstate = BRCMF_BUS_DOWN;
+                bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
 }
 
 /* copy a buffer into a pkt buffer chain */
-static uint brcmf_sdbrcm_glom_from_buf(struct brcmf_bus *bus, uint len)
+static uint brcmf_sdbrcm_glom_from_buf(struct brcmf_sdio *bus, uint len)
 {
         uint n, ret = 0;
         struct sk_buff *p;
@@ -1093,7 +1095,7 @@ static uint brcmf_sdbrcm_glom_from_buf(struct brcmf_bus *bus, uint len)
 }
 
 /* return total length of buffer chain */
-static uint brcmf_sdbrcm_glom_len(struct brcmf_bus *bus)
+static uint brcmf_sdbrcm_glom_len(struct brcmf_sdio *bus)
 {
         struct sk_buff *p;
         uint total;
@@ -1104,7 +1106,7 @@ static uint brcmf_sdbrcm_glom_len(struct brcmf_bus *bus)
         return total;
 }
 
-static void brcmf_sdbrcm_free_glom(struct brcmf_bus *bus)
+static void brcmf_sdbrcm_free_glom(struct brcmf_sdio *bus)
 {
         struct sk_buff *cur, *next;
 
@@ -1114,13 +1116,13 @@ static void brcmf_sdbrcm_free_glom(struct brcmf_bus *bus)
         }
 }
 
-static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
+static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
 {
         u16 dlen, totlen;
         u8 *dptr, num = 0;
 
         u16 sublen, check;
-        struct sk_buff *pfirst, *plast, *pnext, *save_pfirst;
+        struct sk_buff *pfirst, *pnext;
 
         int errcode;
         u8 chan, seq, doff, sfdoff;
@@ -1137,7 +1139,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
 
         /* If there's a descriptor, generate the packet chain */
         if (bus->glomd) {
-                pfirst = plast = pnext = NULL;
+                pfirst = pnext = NULL;
                 dlen = (u16) (bus->glomd->len);
                 dptr = bus->glomd->data;
                 if (!dlen || (dlen & 1)) {
@@ -1228,17 +1230,14 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                  * packet and and copy into the chain.
                  */
                 if (usechain) {
-                        errcode = brcmf_sdcard_recv_buf(bus->sdiodev,
+                        errcode = brcmf_sdcard_recv_chain(bus->sdiodev,
                                         bus->sdiodev->sbwad,
-                                        SDIO_FUNC_2,
-                                        F2SYNC, (u8 *) pfirst->data, dlen,
-                                        pfirst);
+                                        SDIO_FUNC_2, F2SYNC, &bus->glom);
                 } else if (bus->dataptr) {
                         errcode = brcmf_sdcard_recv_buf(bus->sdiodev,
                                         bus->sdiodev->sbwad,
-                                        SDIO_FUNC_2,
-                                        F2SYNC, bus->dataptr, dlen,
-                                        NULL);
+                                        SDIO_FUNC_2, F2SYNC,
+                                        bus->dataptr, dlen);
                         sublen = (u16) brcmf_sdbrcm_glom_from_buf(bus, dlen);
                         if (sublen != dlen) {
                                 brcmf_dbg(ERROR, "FAILED TO COPY, dlen %d sublen %d\n",
@@ -1338,10 +1337,14 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                 /* Remove superframe header, remember offset */
                 skb_pull(pfirst, doff);
                 sfdoff = doff;
+                num = 0;
 
                 /* Validate all the subframe headers */
-                for (num = 0, pnext = pfirst; pnext && !errcode;
-                     num++, pnext = pnext->next) {
+                skb_queue_walk(&bus->glom, pnext) {
+                        /* leave when invalid subframe is found */
+                        if (errcode)
+                                break;
+
                         dptr = (u8 *) (pnext->data);
                         dlen = (u16) (pnext->len);
                         sublen = get_unaligned_le16(dptr);
@@ -1374,6 +1377,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                                           num, doff, sublen, SDPCM_HDRLEN);
                                 errcode = -1;
                         }
+                        /* increase the subframe count */
+                        num++;
                 }
 
                 if (errcode) {
@@ -1394,13 +1399,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                 }
 
                 /* Basic SD framing looks ok - process each packet (header) */
-                save_pfirst = pfirst;
-                plast = NULL;
-
-                for (num = 0; pfirst; rxseq++, pfirst = pnext) {
-                        pnext = pfirst->next;
-                        pfirst->next = NULL;
 
+                skb_queue_walk_safe(&bus->glom, pfirst, pnext) {
                         dptr = (u8 *) (pfirst->data);
                         sublen = get_unaligned_le16(dptr);
                         chan = SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN]);
@@ -1420,6 +1420,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                                 bus->rx_badseq++;
                                 rxseq = seq;
                         }
+                        rxseq++;
+
 #ifdef BCMDBG
                         if (BRCMF_BYTES_ON() && BRCMF_DATA_ON()) {
                                 printk(KERN_DEBUG "Rx Subframe Data:\n");
@@ -1432,36 +1434,22 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                         skb_pull(pfirst, doff);
 
                         if (pfirst->len == 0) {
+                                skb_unlink(pfirst, &bus->glom);
                                 brcmu_pkt_buf_free_skb(pfirst);
-                                if (plast)
-                                        plast->next = pnext;
-                                else
-                                        save_pfirst = pnext;
-
                                 continue;
                         } else if (brcmf_proto_hdrpull(bus->drvr, &ifidx,
                                                        pfirst) != 0) {
                                 brcmf_dbg(ERROR, "rx protocol error\n");
                                 bus->drvr->rx_errors++;
+                                skb_unlink(pfirst, &bus->glom);
                                 brcmu_pkt_buf_free_skb(pfirst);
-                                if (plast)
-                                        plast->next = pnext;
-                                else
-                                        save_pfirst = pnext;
-
                                 continue;
                         }
 
-                        /* this packet will go up, link back into
-                                 chain and count it */
-                        pfirst->next = pnext;
-                        plast = pfirst;
-                        num++;
-
 #ifdef BCMDBG
                         if (BRCMF_GLOM_ON()) {
                                 brcmf_dbg(GLOM, "subframe %d to stack, %p (%p/%d) nxt/lnk %p/%p\n",
-                                          num, pfirst, pfirst->data,
+                                          bus->glom.qlen, pfirst, pfirst->data,
                                           pfirst->len, pfirst->next,
                                           pfirst->prev);
                                 print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
@@ -1470,19 +1458,20 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                         }
 #endif                          /* BCMDBG */
                 }
-                if (num) {
+                /* sent any remaining packets up */
+                if (bus->glom.qlen) {
                         up(&bus->sdsem);
-                        brcmf_rx_frame(bus->drvr, ifidx, save_pfirst, num);
+                        brcmf_rx_frame(bus->drvr, ifidx, &bus->glom);
                         down(&bus->sdsem);
                 }
 
                 bus->rxglomframes++;
-                bus->rxglompkts += num;
+                bus->rxglompkts += bus->glom.qlen;
         }
         return num;
 }
 
-static int brcmf_sdbrcm_dcmd_resp_wait(struct brcmf_bus *bus, uint *condition,
+static int brcmf_sdbrcm_dcmd_resp_wait(struct brcmf_sdio *bus, uint *condition,
                                         bool *pending)
 {
         DECLARE_WAITQUEUE(wait, current);
@@ -1504,7 +1493,7 @@ static int brcmf_sdbrcm_dcmd_resp_wait(struct brcmf_bus *bus, uint *condition,
         return timeout;
 }
 
-static int brcmf_sdbrcm_dcmd_resp_wake(struct brcmf_bus *bus)
+static int brcmf_sdbrcm_dcmd_resp_wake(struct brcmf_sdio *bus)
 {
         if (waitqueue_active(&bus->dcmd_resp_wait))
                 wake_up_interruptible(&bus->dcmd_resp_wait);
@@ -1512,7 +1501,7 @@ static int brcmf_sdbrcm_dcmd_resp_wake(struct brcmf_bus *bus)
         return 0;
 }
 static void
-brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)
+brcmf_sdbrcm_read_control(struct brcmf_sdio *bus, u8 *hdr, uint len, uint doff)
 {
         uint rdlen, pad;
 
@@ -1570,8 +1559,7 @@ brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)
         sdret = brcmf_sdcard_recv_buf(bus->sdiodev,
                                 bus->sdiodev->sbwad,
                                 SDIO_FUNC_2,
-                                F2SYNC, (bus->rxctl + BRCMF_FIRSTREAD), rdlen,
-                                NULL);
+                                F2SYNC, (bus->rxctl + BRCMF_FIRSTREAD), rdlen);
         bus->f2rxdata++;
 
         /* Control frame failures need retransmission */
@@ -1602,7 +1590,7 @@ done:
 }
 
 /* Pad read to blocksize for efficiency */
-static void brcmf_pad(struct brcmf_bus *bus, u16 *pad, u16 *rdlen)
+static void brcmf_pad(struct brcmf_sdio *bus, u16 *pad, u16 *rdlen)
 {
         if (bus->roundup && bus->blocksize && *rdlen > bus->blocksize) {
                 *pad = bus->blocksize - (*rdlen % bus->blocksize);
@@ -1615,7 +1603,7 @@ static void brcmf_pad(struct brcmf_bus *bus, u16 *pad, u16 *rdlen)
 }
 
 static void
-brcmf_alloc_pkt_and_read(struct brcmf_bus *bus, u16 rdlen,
+brcmf_alloc_pkt_and_read(struct brcmf_sdio *bus, u16 rdlen,
                          struct sk_buff **pkt, u8 **rxbuf)
 {
         int sdret;              /* Return code from calls */
@@ -1627,9 +1615,8 @@ brcmf_alloc_pkt_and_read(struct brcmf_bus *bus, u16 rdlen,
         pkt_align(*pkt, rdlen, BRCMF_SDALIGN);
         *rxbuf = (u8 *) ((*pkt)->data);
         /* Read the entire frame */
-        sdret = brcmf_sdcard_recv_buf(bus->sdiodev, bus->sdiodev->sbwad,
-                                      SDIO_FUNC_2, F2SYNC,
-                                      *rxbuf, rdlen, *pkt);
+        sdret = brcmf_sdcard_recv_pkt(bus->sdiodev, bus->sdiodev->sbwad,
+                                      SDIO_FUNC_2, F2SYNC, *pkt);
         bus->f2rxdata++;
 
         if (sdret < 0) {
@@ -1648,7 +1635,7 @@ brcmf_alloc_pkt_and_read(struct brcmf_bus *bus, u16 rdlen,
 
 /* Checks the header */
 static int
-brcmf_check_rxbuf(struct brcmf_bus *bus, struct sk_buff *pkt, u8 *rxbuf,
+brcmf_check_rxbuf(struct brcmf_sdio *bus, struct sk_buff *pkt, u8 *rxbuf,
                   u8 rxseq, u16 nextlen, u16 *len)
 {
         u16 check;
@@ -1704,7 +1691,7 @@ fail:
 
 /* Return true if there may be more frames to read */
 static uint
-brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
+brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
 {
         u16 len, check; /* Extracted hardware header fields */
         u8 chan, seq, doff;     /* Extracted software header fields */
@@ -1727,7 +1714,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
         *finished = false;
 
         for (rxseq = bus->rx_seq, rxleft = maxframes;
-             !bus->rxskip && rxleft && bus->drvr->busstate != BRCMF_BUS_DOWN;
+             !bus->rxskip && rxleft &&
+             bus->drvr->bus_if->state != BRCMF_BUS_DOWN;
              rxseq++, rxleft--) {
 
                 /* Handle glomming separately */
@@ -1857,7 +1845,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
                 /* Read frame header (hardware and software) */
                 sdret = brcmf_sdcard_recv_buf(bus->sdiodev, bus->sdiodev->sbwad,
                                               SDIO_FUNC_2, F2SYNC, bus->rxhdr,
-                                              BRCMF_FIRSTREAD, NULL);
+                                              BRCMF_FIRSTREAD);
                 bus->f2rxhdrs++;
 
                 if (sdret < 0) {
@@ -2006,9 +1994,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
                 pkt_align(pkt, rdlen, BRCMF_SDALIGN);
 
                 /* Read the remaining frame data */
-                sdret = brcmf_sdcard_recv_buf(bus->sdiodev, bus->sdiodev->sbwad,
-                                SDIO_FUNC_2, F2SYNC, ((u8 *) (pkt->data)),
-                                rdlen, pkt);
+                sdret = brcmf_sdcard_recv_pkt(bus->sdiodev, bus->sdiodev->sbwad,
+                                              SDIO_FUNC_2, F2SYNC, pkt);
                 bus->f2rxdata++;
 
                 if (sdret < 0) {
@@ -2075,7 +2062,7 @@ deliver:
 
                 /* Unlock during rx call */
                 up(&bus->sdsem);
-                brcmf_rx_frame(bus->drvr, ifidx, pkt, 1);
+                brcmf_rx_packet(bus->drvr, ifidx, pkt);
                 down(&bus->sdsem);
         }
         rxcount = maxframes - rxleft;
@@ -2095,16 +2082,8 @@ deliver:
         return rxcount;
 }
 
-static int
-brcmf_sdbrcm_send_buf(struct brcmf_bus *bus, u32 addr, uint fn, uint flags,
-                    u8 *buf, uint nbytes, struct sk_buff *pkt)
-{
-        return brcmf_sdcard_send_buf
-                (bus->sdiodev, addr, fn, flags, buf, nbytes, pkt);
-}
-
 static void
-brcmf_sdbrcm_wait_for_event(struct brcmf_bus *bus, bool *lockvar)
+brcmf_sdbrcm_wait_for_event(struct brcmf_sdio *bus, bool *lockvar)
 {
         up(&bus->sdsem);
         wait_event_interruptible_timeout(bus->ctrl_wait,
@@ -2114,7 +2093,7 @@ brcmf_sdbrcm_wait_for_event(struct brcmf_bus *bus, bool *lockvar)
 }
 
 static void
-brcmf_sdbrcm_wait_event_wakeup(struct brcmf_bus *bus)
+brcmf_sdbrcm_wait_event_wakeup(struct brcmf_sdio *bus)
 {
         if (waitqueue_active(&bus->ctrl_wait))
                 wake_up_interruptible(&bus->ctrl_wait);
@@ -2123,7 +2102,7 @@ brcmf_sdbrcm_wait_event_wakeup(struct brcmf_bus *bus)
 
 /* Writes a HW/SW header into the packet and sends it. */
 /* Assumes: (a) header space already there, (b) caller holds lock */
-static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt,
+static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff *pkt,
                               uint chan, bool free_pkt)
 {
         int ret;
@@ -2212,9 +2191,8 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt,
         if (len & (ALIGNMENT - 1))
                         len = roundup(len, ALIGNMENT);
 
-        ret = brcmf_sdbrcm_send_buf(bus, bus->sdiodev->sbwad,
-                                    SDIO_FUNC_2, F2SYNC, frame,
-                                    len, pkt);
+        ret = brcmf_sdcard_send_pkt(bus->sdiodev, bus->sdiodev->sbwad,
+                                    SDIO_FUNC_2, F2SYNC, pkt);
         bus->f2txdata++;
 
         if (ret < 0) {
@@ -2261,7 +2239,7 @@ done:
         return ret;
 }
 
-static uint brcmf_sdbrcm_sendfromq(struct brcmf_bus *bus, uint maxframes)
+static uint brcmf_sdbrcm_sendfromq(struct brcmf_sdio *bus, uint maxframes)
 {
         struct sk_buff *pkt;
         u32 intstatus = 0;
@@ -2309,14 +2287,14 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_bus *bus, uint maxframes)
         }
 
         /* Deflow-control stack if needed */
-        if (drvr->up && (drvr->busstate == BRCMF_BUS_DATA) &&
+        if (drvr->up && (drvr->bus_if->state == BRCMF_BUS_DATA) &&
             drvr->txoff && (pktq_len(&bus->txq) < TXLOW))
                 brcmf_txflowcontrol(drvr, 0, OFF);
 
         return cnt;
 }
 
-static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
+static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
 {
         u32 intstatus, newstatus = 0;
         uint retries = 0;
@@ -2344,7 +2322,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
                                                SBSDIO_DEVICE_CTL, &err);
                 if (err) {
                         brcmf_dbg(ERROR, "error reading DEVCTL: %d\n", err);
-                        bus->drvr->busstate = BRCMF_BUS_DOWN;
+                        bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
                 }
 #endif                          /* BCMDBG */
 
@@ -2354,7 +2332,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
                 if (err) {
                         brcmf_dbg(ERROR, "error reading CSR: %d\n",
                                   err);
-                        bus->drvr->busstate = BRCMF_BUS_DOWN;
+                        bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
                 }
 
                 brcmf_dbg(INFO, "DPC: PENDING, devctl 0x%02x clkctl 0x%02x\n",
@@ -2367,7 +2345,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
                         if (err) {
                                 brcmf_dbg(ERROR, "error reading DEVCTL: %d\n",
                                           err);
-                                bus->drvr->busstate = BRCMF_BUS_DOWN;
+                                bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
                         }
                         devctl &= ~SBSDIO_DEVCTL_CA_INT_ONLY;
                         brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
@@ -2375,7 +2353,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
                         if (err) {
                                 brcmf_dbg(ERROR, "error writing DEVCTL: %d\n",
                                           err);
-                                bus->drvr->busstate = BRCMF_BUS_DOWN;
+                                bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
                         }
                         bus->clkstate = CLK_AVAIL;
                 } else {
@@ -2477,9 +2455,9 @@ clkwait:
                 (bus->clkstate == CLK_AVAIL)) {
                 int ret, i;
 
-                ret = brcmf_sdbrcm_send_buf(bus, bus->sdiodev->sbwad,
+                ret = brcmf_sdcard_send_buf(bus->sdiodev, bus->sdiodev->sbwad,
                         SDIO_FUNC_2, F2SYNC, (u8 *) bus->ctrl_frame_buf,
-                        (u32) bus->ctrl_frame_len, NULL);
+                        (u32) bus->ctrl_frame_len);
 
                 if (ret < 0) {
                         /* On failure, abort the command and
@@ -2531,11 +2509,11 @@ clkwait:
                  else await next interrupt */
         /* On failed register access, all bets are off:
                  no resched or interrupts */
-        if ((bus->drvr->busstate == BRCMF_BUS_DOWN) ||
+        if ((bus->drvr->bus_if->state == BRCMF_BUS_DOWN) ||
             brcmf_sdcard_regfail(bus->sdiodev)) {
                 brcmf_dbg(ERROR, "failed backplane access over SDIO, halting operation %d\n",
                           brcmf_sdcard_regfail(bus->sdiodev));
-                bus->drvr->busstate = BRCMF_BUS_DOWN;
+                bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
                 bus->intstatus = 0;
         } else if (bus->clkstate == CLK_PENDING) {
                 brcmf_dbg(INFO, "rescheduled due to CLK_PENDING awaiting I_CHIPACTIVE interrupt\n");
@@ -2562,7 +2540,7 @@ clkwait:
 
 static int brcmf_sdbrcm_dpc_thread(void *data)
 {
-        struct brcmf_bus *bus = (struct brcmf_bus *) data;
+        struct brcmf_sdio *bus = (struct brcmf_sdio *) data;
 
         allow_signal(SIGTERM);
         /* Run until signal received */
@@ -2572,12 +2550,12 @@ static int brcmf_sdbrcm_dpc_thread(void *data)
                 if (!wait_for_completion_interruptible(&bus->dpc_wait)) {
                         /* Call bus dpc unless it indicated down
                         (then clean stop) */
-                        if (bus->drvr->busstate != BRCMF_BUS_DOWN) {
+                        if (bus->drvr->bus_if->state != BRCMF_BUS_DOWN) {
                                 if (brcmf_sdbrcm_dpc(bus))
                                         complete(&bus->dpc_wait);
                         } else {
                                 /* after stopping the bus, exit thread */
-                                brcmf_sdbrcm_bus_stop(bus);
+                                brcmf_sdbrcm_bus_stop(bus->sdiodev->dev);
                                 bus->dpc_tsk = NULL;
                                 break;
                         }
@@ -2587,10 +2565,13 @@ static int brcmf_sdbrcm_dpc_thread(void *data)
         return 0;
 }
 
-int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)
+int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
 {
         int ret = -EBADE;
         uint datalen, prec;
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
+        struct brcmf_sdio *bus = sdiodev->bus;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -2638,7 +2619,7 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)
 }
 
 static int
-brcmf_sdbrcm_membytes(struct brcmf_bus *bus, bool write, u32 address, u8 *data,
+brcmf_sdbrcm_membytes(struct brcmf_sdio *bus, bool write, u32 address, u8 *data,
                  uint size)
 {
         int bcmerror = 0;
@@ -2699,7 +2680,7 @@ xfer_done:
 #ifdef BCMDBG
 #define CONSOLE_LINE_MAX        192
 
-static int brcmf_sdbrcm_readconsole(struct brcmf_bus *bus)
+static int brcmf_sdbrcm_readconsole(struct brcmf_sdio *bus)
 {
         struct brcmf_console *c = &bus->console;
         u8 line[CONSOLE_LINE_MAX], ch;
@@ -2776,14 +2757,14 @@ break2:
 }
 #endif                          /* BCMDBG */
 
-static int brcmf_tx_frame(struct brcmf_bus *bus, u8 *frame, u16 len)
+static int brcmf_tx_frame(struct brcmf_sdio *bus, u8 *frame, u16 len)
 {
         int i;
         int ret;
 
         bus->ctrl_frame_stat = false;
-        ret = brcmf_sdbrcm_send_buf(bus, bus->sdiodev->sbwad,
-                                    SDIO_FUNC_2, F2SYNC, frame, len, NULL);
+        ret = brcmf_sdcard_send_buf(bus->sdiodev, bus->sdiodev->sbwad,
+                                    SDIO_FUNC_2, F2SYNC, frame, len);
 
         if (ret < 0) {
                 /* On failure, abort the command and terminate the frame */
@@ -2819,7 +2800,7 @@ static int brcmf_tx_frame(struct brcmf_bus *bus, u8 *frame, u16 len)
 }
 
 int
-brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
+brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)
 {
         u8 *frame;
         u16 len;
@@ -2827,6 +2808,9 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
         uint retries = 0;
         u8 doff = 0;
         int ret = -1;
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
+        struct brcmf_sdio *bus = sdiodev->bus;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -2934,11 +2918,14 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
 }
 
 int
-brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
+brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen)
 {
         int timeleft;
         uint rxlen = 0;
         bool pending;
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
+        struct brcmf_sdio *bus = sdiodev->bus;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -2971,7 +2958,7 @@ brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
         return rxlen ? (int)rxlen : -ETIMEDOUT;
 }
 
-static int brcmf_sdbrcm_downloadvars(struct brcmf_bus *bus, void *arg, int len)
+static int brcmf_sdbrcm_downloadvars(struct brcmf_sdio *bus, void *arg, int len)
 {
         int bcmerror = 0;
 
@@ -3004,7 +2991,7 @@ err:
         return bcmerror;
 }
 
-static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus)
+static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
 {
         int bcmerror = 0;
         u32 varsize;
@@ -3091,7 +3078,7 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus)
         return bcmerror;
 }
 
-static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter)
+static int brcmf_sdbrcm_download_state(struct brcmf_sdio *bus, bool enter)
 {
         uint retries;
         int bcmerror = 0;
@@ -3134,13 +3121,13 @@ static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter)
                 /* Allow HT Clock now that the ARM is running. */
                 bus->alp_only = false;
 
-                bus->drvr->busstate = BRCMF_BUS_LOAD;
+                bus->drvr->bus_if->state = BRCMF_BUS_LOAD;
         }
 fail:
         return bcmerror;
 }
 
-static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_bus *bus)
+static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_sdio *bus)
 {
         if (bus->firmware->size < bus->fw_ptr + len)
                 len = bus->firmware->size - bus->fw_ptr;
@@ -3150,10 +3137,7 @@ static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_bus *bus)
         return len;
 }
 
-MODULE_FIRMWARE(BCM4329_FW_NAME);
-MODULE_FIRMWARE(BCM4329_NV_NAME);
-
-static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus)
+static int brcmf_sdbrcm_download_code_file(struct brcmf_sdio *bus)
 {
         int offset = 0;
         uint len;
@@ -3162,8 +3146,7 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus)
 
         brcmf_dbg(INFO, "Enter\n");
 
-        bus->fw_name = BCM4329_FW_NAME;
-        ret = request_firmware(&bus->firmware, bus->fw_name,
+        ret = request_firmware(&bus->firmware, BRCMFMAC_FW_NAME,
                                &bus->sdiodev->func[2]->dev);
         if (ret) {
                 brcmf_dbg(ERROR, "Fail to request firmware %d\n", ret);
@@ -3253,15 +3236,14 @@ static uint brcmf_process_nvram_vars(char *varbuf, uint len)
         return buf_len;
 }
 
-static int brcmf_sdbrcm_download_nvram(struct brcmf_bus *bus)
+static int brcmf_sdbrcm_download_nvram(struct brcmf_sdio *bus)
 {
         uint len;
         char *memblock = NULL;
         char *bufp;
         int ret;
 
-        bus->nv_name = BCM4329_NV_NAME;
-        ret = request_firmware(&bus->firmware, bus->nv_name,
+        ret = request_firmware(&bus->firmware, BRCMFMAC_NV_NAME,
                                &bus->sdiodev->func[2]->dev);
         if (ret) {
                 brcmf_dbg(ERROR, "Fail to request nvram %d\n", ret);
@@ -3301,7 +3283,7 @@ err:
         return ret;
 }
 
-static int _brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)
+static int _brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus)
 {
         int bcmerror = -1;
 
@@ -3334,7 +3316,7 @@ err:
 }
 
 static bool
-brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)
+brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus)
 {
         bool ret;
 
@@ -3348,12 +3330,15 @@ brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)
         return ret;
 }
 
-void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus)
+void brcmf_sdbrcm_bus_stop(struct device *dev)
 {
         u32 local_hostintmask;
         u8 saveclk;
         uint retries;
         int err;
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
+        struct brcmf_sdio *bus = sdiodev->bus;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3382,7 +3367,7 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus)
         bus->hostintmask = 0;
 
         /* Change our idea of bus state */
-        bus->drvr->busstate = BRCMF_BUS_DOWN;
+        bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
 
         /* Force clocks on backplane to be sure F2 interrupt propagates */
         saveclk = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
@@ -3426,9 +3411,11 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus)
         up(&bus->sdsem);
 }
 
-int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)
+int brcmf_sdbrcm_bus_init(struct device *dev)
 {
-        struct brcmf_bus *bus = drvr->bus;
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
+        struct brcmf_sdio *bus = sdiodev->bus;
         unsigned long timeout;
         uint retries = 0;
         u8 ready, enable;
@@ -3438,7 +3425,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)
         brcmf_dbg(TRACE, "Enter\n");
 
         /* try to download image and nvram to the dongle */
-        if (drvr->busstate == BRCMF_BUS_DOWN) {
+        if (bus_if->state == BRCMF_BUS_DOWN) {
                 if (!(brcmf_sdbrcm_download_firmware(bus)))
                         return -1;
         }
@@ -3504,7 +3491,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)
                                        SBSDIO_WATERMARK, 8, &err);
 
                 /* Set bus state according to enable result */
-                drvr->busstate = BRCMF_BUS_DATA;
+                bus_if->state = BRCMF_BUS_DATA;
         }
 
         else {
@@ -3519,7 +3506,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)
                                SBSDIO_FUNC1_CHIPCLKCSR, saveclk, &err);
 
         /* If we didn't come up, turn off backplane clock */
-        if (drvr->busstate != BRCMF_BUS_DATA)
+        if (bus_if->state != BRCMF_BUS_DATA)
                 brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);
 
 exit:
@@ -3530,7 +3517,7 @@ exit:
 
 void brcmf_sdbrcm_isr(void *arg)
 {
-        struct brcmf_bus *bus = (struct brcmf_bus *) arg;
+        struct brcmf_sdio *bus = (struct brcmf_sdio *) arg;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3539,7 +3526,7 @@ void brcmf_sdbrcm_isr(void *arg)
                 return;
         }
 
-        if (bus->drvr->busstate == BRCMF_BUS_DOWN) {
+        if (bus->drvr->bus_if->state == BRCMF_BUS_DOWN) {
                 brcmf_dbg(ERROR, "bus is down. we have nothing to do\n");
                 return;
         }
@@ -3562,14 +3549,14 @@ void brcmf_sdbrcm_isr(void *arg)
                 complete(&bus->dpc_wait);
 }
 
-static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)
+static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
 {
-        struct brcmf_bus *bus;
+#ifdef BCMDBG
+        struct brcmf_bus *bus_if = dev_get_drvdata(bus->sdiodev->dev);
+#endif  /* BCMDBG */
 
         brcmf_dbg(TIMER, "Enter\n");
 
-        bus = drvr->bus;
-
         /* Ignore the timer if simulating bus down */
         if (bus->sleeping)
                 return false;
@@ -3613,7 +3600,8 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)
         }
 #ifdef BCMDBG
         /* Poll for console output periodically */
-        if (drvr->busstate == BRCMF_BUS_DATA && bus->console_interval != 0) {
+        if (bus_if->state == BRCMF_BUS_DATA &&
+            bus->console_interval != 0) {
                 bus->console.count += BRCMF_WD_POLL_MS;
                 if (bus->console.count >= bus->console_interval) {
                         bus->console.count -= bus->console_interval;
@@ -3648,10 +3636,12 @@ static bool brcmf_sdbrcm_chipmatch(u16 chipid)
 {
         if (chipid == BCM4329_CHIP_ID)
                 return true;
+        if (chipid == BCM4330_CHIP_ID)
+                return true;
         return false;
 }
 
-static void brcmf_sdbrcm_release_malloc(struct brcmf_bus *bus)
+static void brcmf_sdbrcm_release_malloc(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3663,7 +3653,7 @@ static void brcmf_sdbrcm_release_malloc(struct brcmf_bus *bus)
         bus->databuf = NULL;
 }
 
-static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus)
+static bool brcmf_sdbrcm_probe_malloc(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3699,7 +3689,7 @@ fail:
 }
 
 static bool
-brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva)
+brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva)
 {
         u8 clkctl = 0;
         int err = 0;
@@ -3784,7 +3774,7 @@ fail:
         return false;
 }
 
-static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus)
+static bool brcmf_sdbrcm_probe_init(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3792,7 +3782,7 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus)
         brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx,
                                SDIO_FUNC_ENABLE_1, NULL);
 
-        bus->drvr->busstate = BRCMF_BUS_DOWN;
+        bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
         bus->sleeping = false;
         bus->rxflow = false;
 
@@ -3819,7 +3809,7 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus)
 static int
 brcmf_sdbrcm_watchdog_thread(void *data)
 {
-        struct brcmf_bus *bus = (struct brcmf_bus *)data;
+        struct brcmf_sdio *bus = (struct brcmf_sdio *)data;
 
         allow_signal(SIGTERM);
         /* Run until signal received */
@@ -3827,7 +3817,7 @@ brcmf_sdbrcm_watchdog_thread(void *data)
                 if (kthread_should_stop())
                         break;
                 if (!wait_for_completion_interruptible(&bus->watchdog_wait)) {
-                        brcmf_sdbrcm_bus_watchdog(bus->drvr);
+                        brcmf_sdbrcm_bus_watchdog(bus);
                         /* Count the tick for reference */
                         bus->drvr->tickcnt++;
                 } else
@@ -3839,7 +3829,7 @@ brcmf_sdbrcm_watchdog_thread(void *data)
 static void
 brcmf_sdbrcm_watchdog(unsigned long data)
 {
-        struct brcmf_bus *bus = (struct brcmf_bus *)data;
+        struct brcmf_sdio *bus = (struct brcmf_sdio *)data;
 
         if (bus->watchdog_tsk) {
                 complete(&bus->watchdog_wait);
@@ -3850,7 +3840,7 @@ brcmf_sdbrcm_watchdog(unsigned long data)
         }
 }
 
-static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)
+static void brcmf_sdbrcm_release_dongle(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3867,7 +3857,7 @@ static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)
 }
 
 /* Detach and free everything */
-static void brcmf_sdbrcm_release(struct brcmf_bus *bus)
+static void brcmf_sdbrcm_release(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3889,21 +3879,10 @@ static void brcmf_sdbrcm_release(struct brcmf_bus *bus)
         brcmf_dbg(TRACE, "Disconnected\n");
 }
 
-void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
-                         u32 regsva, struct brcmf_sdio_dev *sdiodev)
+void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
 {
         int ret;
-        struct brcmf_bus *bus;
-
-        /* Init global variables at run-time, not as part of the declaration.
-         * This is required to support init/de-init of the driver.
-         * Initialization
-         * of globals as part of the declaration results in non-deterministic
-         * behavior since the value of the globals may be different on the
-         * first time that the driver is initialized vs subsequent
-         * initializations.
-         */
-        brcmf_c_init();
+        struct brcmf_sdio *bus;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3911,7 +3890,7 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
          * regsva == SI_ENUM_BASE*/
 
         /* Allocate private bus interface state */
-        bus = kzalloc(sizeof(struct brcmf_bus), GFP_ATOMIC);
+        bus = kzalloc(sizeof(struct brcmf_sdio), GFP_ATOMIC);
         if (!bus)
                 goto fail;
 
@@ -3963,7 +3942,7 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
         }
 
         /* Attach to the brcmf/OS/network interface */
-        bus->drvr = brcmf_attach(bus, SDPCM_RESERVE);
+        bus->drvr = brcmf_attach(bus, SDPCM_RESERVE, bus->sdiodev->dev);
         if (!bus->drvr) {
                 brcmf_dbg(ERROR, "brcmf_attach failed\n");
                 goto fail;
@@ -4015,7 +3994,7 @@ fail:
 
 void brcmf_sdbrcm_disconnect(void *ptr)
 {
-        struct brcmf_bus *bus = (struct brcmf_bus *)ptr;
+        struct brcmf_sdio *bus = (struct brcmf_sdio *)ptr;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -4025,13 +4004,8 @@ void brcmf_sdbrcm_disconnect(void *ptr)
         brcmf_dbg(TRACE, "Disconnected\n");
 }
 
-struct device *brcmf_bus_get_device(struct brcmf_bus *bus)
-{
-        return &bus->sdiodev->func[2]->dev;
-}
-
 void
-brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick)
+brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick)
 {
         /* Totally stop the timer */
         if (!wdtick && bus->wd_timer_valid == true) {
@@ -4042,7 +4016,7 @@ brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick)
         }
 
         /* don't start the wd until fw is loaded */
-        if (bus->drvr->busstate == BRCMF_BUS_DOWN)
+        if (bus->drvr->bus_if->state == BRCMF_BUS_DOWN)
                 return;
 
         if (wdtick) {