---

yaml --- r: 220309 b: refs/heads/master c: 3acf41c h: refs/heads/master i: 220307: 366db26 v: v3
git-mirror · Oct 12, 2010 · 988e1b5 · 988e1b5
1 parent 1895610
commit 988e1b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec1284e104f9a598474cb7979c01633b5d1d550b
+refs/heads/master: 3acf41c5c9c538d22046b5f9822d58c9981e53da
diff --git a/trunk/drivers/staging/brcm80211/include/linux_osl.h b/trunk/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/trunk/drivers/staging/brcm80211/include/siutils.h b/trunk/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))