summaryrefslogtreecommitdiffstats
path: root/drivers/staging/brcm80211
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-12 13:20:00 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-12 13:20:00 -0700
commit159a3b78f95eaf52d129833a45f95ca9eeaa77a7 (patch)
tree680b0083e0e6361e67cbff3c3e5cdf784eada514 /drivers/staging/brcm80211
parent3acf41c5c9c538d22046b5f9822d58c9981e53da (diff)
downloadlinux-159a3b78f95eaf52d129833a45f95ca9eeaa77a7.tar.bz2
Staging: brcm80211: phy: remove unneeded use of uintptr
uintptr shouldn't be used when you are just casting to a pointer anyway, so remove it from these usages. 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')
-rw-r--r--drivers/staging/brcm80211/phy/wlc_phy_cmn.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
index ff9bb06b69af..c3c0eb77ac1b 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
+++ b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
@@ -439,7 +439,7 @@ void write_phy_reg(phy_info_t *pi, u16 addr, u16 val)
if (addr == 0x72)
(void)R_REG(osh, &regs->phyregdata);
#else
- W_REG(osh, (volatile u32 *)(uintptr) (&regs->phyregaddr),
+ W_REG(osh, (volatile u32 *)(&regs->phyregaddr),
addr | (val << 16));
if (BUSTYPE(pi->sh->bustype) == PCI_BUS) {
if (++pi->phy_wreg >= pi->phy_wreg_limit) {
@@ -1167,9 +1167,9 @@ wlc_phy_read_table(phy_info_t *pi, const phytbl_info_t *ptbl_info,
uint tbl_id = ptbl_info->tbl_id;
uint tbl_offset = ptbl_info->tbl_offset;
uint tbl_width = ptbl_info->tbl_width;
- u8 *ptbl_8b = (u8 *) (uintptr) ptbl_info->tbl_ptr;
- u16 *ptbl_16b = (u16 *) (uintptr) ptbl_info->tbl_ptr;
- u32 *ptbl_32b = (u32 *) (uintptr) ptbl_info->tbl_ptr;
+ u8 *ptbl_8b = (u8 *)ptbl_info->tbl_ptr;
+ u16 *ptbl_16b = (u16 *)ptbl_info->tbl_ptr;
+ u32 *ptbl_32b = (u32 *)ptbl_info->tbl_ptr;
ASSERT((tbl_width == 8) || (tbl_width == 16) || (tbl_width == 32));