diff options
| -rw-r--r-- | drivers/staging/brcm80211/phy/wlc_phy_cmn.c | 8 |
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 ff9bb06b69a..c3c0eb77ac1 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, ®s->phyregdata); #else - W_REG(osh, (volatile u32 *)(uintptr) (®s->phyregaddr), + W_REG(osh, (volatile u32 *)(®s->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)); |