diff options
| -rw-r--r-- | drivers/staging/brcm80211/include/linux_osl.h | 8 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/include/siutils.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h index 9fbb6cca390..852d5ad79cf 100644 --- a/drivers/staging/brcm80211/include/linux_osl.h +++ b/drivers/staging/brcm80211/include/linux_osl.h @@ -236,11 +236,11 @@ extern int osl_error(int bcmerror); switch (sizeof(*(r))) { \ case sizeof(u8): \ __osl_v = \ - readb((volatile u8*)((uintptr)(r)^3)); \ + readb((volatile u8*)((r)^3)); \ break; \ case sizeof(u16): \ __osl_v = \ - readw((volatile u16*)((uintptr)(r)^2)); \ + readw((volatile u16*)((r)^2)); \ break; \ case sizeof(u32): \ __osl_v = readl((volatile u32*)(r)); \ @@ -255,10 +255,10 @@ extern int osl_error(int bcmerror); switch (sizeof(*(r))) { \ case sizeof(u8): \ writeb((u8)(v), \ - (volatile u8*)((uintptr)(r)^3)); break; \ + (volatile u8*)((r)^3)); break; \ case sizeof(u16): \ writew((u16)(v), \ - (volatile u16*)((uintptr)(r)^2)); break; \ + (volatile u16*)((r)^2)); break; \ case sizeof(u32): \ writel((u32)(v), \ (volatile u32*)(r)); break; \ diff --git a/drivers/staging/brcm80211/include/siutils.h b/drivers/staging/brcm80211/include/siutils.h index 3e883433746..f7b9483ee59 100644 --- a/drivers/staging/brcm80211/include/siutils.h +++ b/drivers/staging/brcm80211/include/siutils.h @@ -265,7 +265,7 @@ typedef struct si_info { u32 oob_router; /* oob router registers for axi */ } si_info_t; -#define SI_INFO(sih) (si_info_t *)(uintptr)sih +#define SI_INFO(sih) (si_info_t *)sih #define GOODCOREADDR(x, b) (((x) >= (b)) && ((x) < ((b) + SI_MAXCORES * SI_CORE_SIZE)) && \ IS_ALIGNED((x), SI_CORE_SIZE)) |