diff options
| author |   Roland Vossen <rvossen@broadcom.com> | 2011-07-05 22:06:11 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 19:41:42 -0700 |
| commit | 72ac5a16f88c355554e083efa51b0b4ad529b670 (patch) | |
| tree | 999cf9fc19e53f8111950eb565004cc770c01734 /drivers/staging/brcm80211 | |
| parent | staging: brcm80211: replaced macro W_SDREG by function w_sdreg() (diff) | |
| download | linux-dev-72ac5a16f88c355554e083efa51b0b4ad529b670.tar.xz linux-dev-72ac5a16f88c355554e083efa51b0b4ad529b670.zip | |
staging: brcm80211: got rid of redundant member 'regs' of struct dhd_bus
Code cleanup. Decreases amd64 compiler warnings.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211')
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 9ac256e79af8..9bc47a423ac3 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -552,8 +552,6 @@ struct brcmf_bus { uint varsz; /* Size of variables buffer */ u32 sbaddr; /* Current SB window pointer (-1, invalid) */ - /* SDIO core, 32 bit address on the backplane bus: */ - struct sdpcmd_regs *regs; uint sdpcmrev; /* SDIO core revision */ uint armrev; /* CPU core revision */ uint ramrev; /* SOCRAM core revision */ @@ -2725,7 +2723,7 @@ brcmf_sdbrcm_doiovar(struct brcmf_bus *bus, const struct brcmu_iovar *vi, u32 ac sd_ptr = (struct brcmf_sdreg *) params; - addr = (unsigned long)bus->regs + sd_ptr->offset; + addr = bus->ci->buscorebase + sd_ptr->offset; size = sd_ptr->func; int_val = (s32) brcmf_sdcard_reg_read(bus->card, addr, size); @@ -2742,7 +2740,7 @@ brcmf_sdbrcm_doiovar(struct brcmf_bus *bus, const struct brcmu_iovar *vi, u32 ac sd_ptr = (struct brcmf_sdreg *) params; - addr = (unsigned long)bus->regs + sd_ptr->offset; + addr = bus->ci->buscorebase + sd_ptr->offset; size = sd_ptr->func; brcmf_sdcard_reg_write(bus->card, addr, size, sd_ptr->value); @@ -5610,10 +5608,10 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, void *card, void *regsva, bus->ramsize, bus->orig_ramsize)); } - bus->regs = (void *)bus->ci->buscorebase; - /* Set core control so an SDIO reset does a backplane reset */ - OR_REG((u32)&bus->regs->corecontrol, CC_BPRESEN, u32); + OR_REG(bus->ci->buscorebase + offsetof(struct sdpcmd_regs, + corecontrol), + CC_BPRESEN, u32); brcmu_pktq_init(&bus->txq, (PRIOMASK + 1), TXQLEN); |