Skip to contentSkip to conversation

arm: nwfpe: '&pointer[0]' to 'pointer' fix

PATCH In review Maxin B. John 2 participants 2 messages Aug 25, 2011 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: nwfpe: '&pointer[0]' to 'pointer' fix

'&pointer[0]' to 'pointer' fix in arch/arm/nwfpe/fpa11_cpdt.c

---

arch/arm/nwfpe/fpa11_cpdt.c +9 -9
index d31c49f..6e9eb45 100644
@@ -42,11 +42,11 @@ static inline void loadDouble(const unsigned int Fn, const unsigned int __user *
 	p = (unsigned int *) &fpa11->fpreg[Fn].fDouble;
 	fpa11->fType[Fn] = typeDouble;
 #ifdef __ARMEB__
-	get_user(p[0], &pMem[0]);	/* sign & exponent */
+	get_user(p[0], pMem);	/* sign & exponent */
 	get_user(p[1], &pMem[1]);
 #else
 	get_user(p[0], &pMem[1]);
-	get_user(p[1], &pMem[0]);	/* sign & exponent */
+	get_user(p[1], pMem);	/* sign & exponent */
 #endif
 }
 
@@ -57,7 +57,7 @@ static inline void loadExtended(const unsigned int Fn, const unsigned int __user
 	unsigned int *p;
 	p = (unsigned int *) &fpa11->fpreg[Fn].fExtended;
 	fpa11->fType[Fn] = typeExtended;
-	get_user(p[0], &pMem[0]);	/* sign & exponent */
+	get_user(p[0], pMem);	/* sign & exponent */
 #ifdef __ARMEB__
 	get_user(p[1], &pMem[1]);	/* ms bits */
 	get_user(p[2], &pMem[2]);	/* ls bits */
@@ -75,7 +75,7 @@ static inline void loadMultiple(const unsigned int Fn, const unsigned int __user
 	unsigned long x;
 
 	p = (unsigned int *) &(fpa11->fpreg[Fn]);
-	get_user(x, &pMem[0]);
+	get_user(x, pMem);
 	fpa11->fType[Fn] = (x >> 14) & 0x00000003;
 
 	switch (fpa11->fType[Fn]) {
@@ -150,10 +150,10 @@ static inline void storeDouble(struct roundingData *roundData, const unsigned in
 	}
 
 #ifdef __ARMEB__
-	put_user(val.i[0], &pMem[0]);	/* msw */
+	put_user(val.i[0], pMem);	/* msw */
 	put_user(val.i[1], &pMem[1]);	/* lsw */
 #else
-	put_user(val.i[1], &pMem[0]);	/* msw */
+	put_user(val.i[1], pMem);	/* msw */
 	put_user(val.i[0], &pMem[1]);	/* lsw */
 #endif
 }
@@ -180,7 +180,7 @@ static inline void storeExtended(const unsigned int Fn, unsigned int __user *pMe
 		val.f = fpa11->fpreg[Fn].fExtended;
 	}
 
-	put_user(val.i[0], &pMem[0]);	/* sign & exp */
+	put_user(val.i[0], pMem);	/* sign & exp */
 #ifdef __ARMEB__
 	put_user(val.i[1], &pMem[1]);	/* msw */
 	put_user(val.i[2], &pMem[2]);
@@ -205,7 +205,7 @@ static inline void storeMultiple(const unsigned int Fn, unsigned int __user *pMe
 		{
 			put_user(p[0], &pMem[2]);	/* single */
 			put_user(p[1], &pMem[1]);	/* double msw */
-			put_user(nType << 14, &pMem[0]);
+			put_user(nType << 14, pMem);
 		}
 		break;
 
@@ -214,7 +214,7 @@ static inline void storeMultiple(const unsigned int Fn, unsigned int __user *pMe
 		{
 			put_user(p[2], &pMem[1]);	/* msw */
 			put_user(p[1], &pMem[2]);
-			put_user((p[0] & 0x80003fff) | (nType << 14), &pMem[0]);
+			put_user((p[0] & 0x80003fff) | (nType << 14), pMem);
 		}
 		break;
 #endif
#1 lore raw
Quoted 1 line · Maxin B. John

'&pointer[0]' to 'pointer' fix in arch/arm/nwfpe/fpa11_cpdt.c

Your reason being?

arch/arm/nwfpe/fpa11_cpdt.c static inline void loadDouble(const unsigned int Fn, const unsigned int __user * · line 46

Quoted 4 lines

#ifdef __ARMEB__

arch/arm/nwfpe/fpa11_cpdt.c +1 -1
-	get_user(p[0], &pMem[0]);	/* sign & exponent */
+	get_user(p[0], pMem);	/* sign & exponent */
 	get_user(p[1], &pMem[1]);

You may notice the original code has some consistency. Your replacement is less consistent. If you wish to make this change, it should change to:

	get_user(p[0], pMem + 0);
	get_user(p[1], pMem + 1);

to maintain consistency.