diff options
| author | Greg Kroah-Hartman | 2010-10-12 23:04:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-10-12 23:04:26 +0200 |
| commit | c11b0ef8fe171f0b50999d61e401e4908980a774 (patch) | |
| tree | 6ea2781710f38ad65cee69e93f8833c9051c8ff4 /drivers/staging/brcm80211/util | |
| parent | Staging: brcm80211: util: remove unneeded use of uintptr (diff) | |
| download | kernel-qcow2-linux-c11b0ef8fe171f0b50999d61e401e4908980a774.tar.gz kernel-qcow2-linux-c11b0ef8fe171f0b50999d61e401e4908980a774.tar.xz kernel-qcow2-linux-c11b0ef8fe171f0b50999d61e401e4908980a774.zip | |
Staging: brcm80211: remove sbpciregs_t typedef
don't use a typedef, use a 'struct'.
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/util')
| -rw-r--r-- | drivers/staging/brcm80211/util/nicpci.c | 4 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/util/siutils.c | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/util/nicpci.c index 36696f17e71f..09c2e10d8e2a 100644 --- a/drivers/staging/brcm80211/util/nicpci.c +++ b/drivers/staging/brcm80211/util/nicpci.c @@ -32,7 +32,7 @@ typedef struct { union { sbpcieregs_t *pcieregs; - sbpciregs_t *pciregs; + struct sbpciregs *pciregs; } regs; /* Memory mapped register to the core */ si_t *sih; /* System interconnect handle */ @@ -136,7 +136,7 @@ void *pcicore_init(si_t *sih, osl_t *osh, void *regs) ASSERT(cap_ptr); pi->pciecap_lcreg_offset = cap_ptr + PCIE_CAP_LINKCTRL_OFFSET; } else - pi->regs.pciregs = (sbpciregs_t *) regs; + pi->regs.pciregs = (struct sbpciregs *) regs; return pi; } diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c index ddbbb60c9798..963dc3fc6153 100644 --- a/drivers/staging/brcm80211/util/siutils.c +++ b/drivers/staging/brcm80211/util/siutils.c @@ -1665,7 +1665,7 @@ void si_pci_down(si_t *sih) void si_pci_setup(si_t *sih, uint coremask) { si_info_t *sii; - sbpciregs_t *pciregs = NULL; + struct sbpciregs *pciregs = NULL; u32 siflag = 0, w; uint idx = 0; @@ -1685,8 +1685,7 @@ void si_pci_setup(si_t *sih, uint coremask) siflag = si_flag(sih); /* switch over to pci core */ - pciregs = - (sbpciregs_t *) si_setcoreidx(sih, sii->pub.buscoreidx); + pciregs = (struct sbpciregs *)si_setcoreidx(sih, sii->pub.buscoreidx); } /* @@ -1727,7 +1726,7 @@ void si_pci_setup(si_t *sih, uint coremask) int si_pci_fixcfg(si_t *sih) { uint origidx, pciidx; - sbpciregs_t *pciregs = NULL; + struct sbpciregs *pciregs = NULL; sbpcieregs_t *pcieregs = NULL; void *regs = NULL; u16 val16, *reg16 = NULL; @@ -1748,7 +1747,7 @@ int si_pci_fixcfg(si_t *sih) ASSERT(pcieregs != NULL); reg16 = &pcieregs->sprom[SRSH_PI_OFFSET]; } else if (sii->pub.buscoretype == PCI_CORE_ID) { - pciregs = (sbpciregs_t *) si_setcore(&sii->pub, PCI_CORE_ID, 0); + pciregs = (struct sbpciregs *)si_setcore(&sii->pub, PCI_CORE_ID, 0); regs = pciregs; ASSERT(pciregs != NULL); reg16 = &pciregs->sprom[SRSH_PI_OFFSET]; |