[PATCH] Change names of local variables to silence sparse

[PATCH] Change names of local variables to silence sparse

[Atsushi Nemoto]

This patch is an workaround for these sparse warnings:

linux/include/linux/calc64.h:25:17: warning: symbol '__quot' shadows an earlier one
linux/include/linux/calc64.h:25:17: originally declared here
linux/include/linux/calc64.h:25:17: warning: symbol '__mod' shadows an earlier one
linux/include/linux/calc64.h:25:17: originally declared here

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
diff --git a/include/asm-mips/div64.h b/include/asm-mips/div64.h
index 66189f5..716371b 100644
--- a/include/asm-mips/div64.h
+++ b/include/asm-mips/div64.h
@@ -20,7 +20,7 @@
  */
 
 #define do_div64_32(res, high, low, base) ({ \
-	unsigned long __quot, __mod; \
+	unsigned long __quot32, __mod32; \
 	unsigned long __cf, __tmp, __tmp2, __i; \
 	\
 	__asm__(".set	push\n\t" \
@@ -48,12 +48,13 @@
 		"bnez	%4, 0b\n\t" \
 		" srl	%5, %1, 0x1f\n\t" \
 		".set	pop" \
-		: "=&r" (__mod), "=&r" (__tmp), "=&r" (__quot), "=&r" (__cf), \
+		: "=&r" (__mod32), "=&r" (__tmp), \
+		  "=&r" (__quot32), "=&r" (__cf), \
 		  "=&r" (__i), "=&r" (__tmp2) \
 		: "Jr" (base), "0" (high), "1" (low)); \
 	\
-	(res) = __quot; \
-	__mod; })
+	(res) = __quot32; \
+	__mod32; })
 
 #define do_div(n, base) ({ \
 	unsigned long long __quot; \

Re: [PATCH] Change names of local variables to silence sparse

[Ralf Baechle]

On Wed, Jul 11, 2007 at 12:24:14AM +0900, Atsushi Nemoto wrote:

> This patch is an workaround for these sparse warnings:
> 
> linux/include/linux/calc64.h:25:17: warning: symbol '__quot' shadows an earlier one
> linux/include/linux/calc64.h:25:17: originally declared here
> linux/include/linux/calc64.h:25:17: warning: symbol '__mod' shadows an earlier one
> linux/include/linux/calc64.h:25:17: originally declared here

Thanks, applied.

  Ralf