]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Staging: brcm80211: phy: remove unneeded use of uintptr
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 12 Oct 2010 20:20:00 +0000 (13:20 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 12 Oct 2010 20:20:00 +0000 (13:20 -0700)
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>
drivers/staging/brcm80211/phy/wlc_phy_cmn.c

index ff9bb06b69afea6ea8263dac16b4c2b1b2078b30..c3c0eb77ac1b5f9af8c30973a952fa65a2bab607 100644 (file)
@@ -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));