---

yaml --- r: 220310 b: refs/heads/master c: 159a3b7 h: refs/heads/master v: v3
git-mirror · Oct 12, 2010 · 00f5c84 · 00f5c84
1 parent 988e1b5
commit 00f5c84
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3acf41c5c9c538d22046b5f9822d58c9981e53da
+refs/heads/master: 159a3b78f95eaf52d129833a45f95ca9eeaa77a7
diff --git a/trunk/drivers/staging/brcm80211/phy/wlc_phy_cmn.c b/trunk/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));