From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 11 Oct 2008 15:18:53 +0000 (+0100)
Subject: MIPS: IP checksums: Remove unncessary .set pseudos
X-Git-Tag: v2.6.28-rc1~719^2~12
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=60724ca59eda766a30be57aec6b49bc3e2bead91;p=linux-2.6-omap-h63xx.git

MIPS: IP checksums: Remove unncessary .set pseudos

They possibly silence meaningful warnings ...

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/lib/csum_partial.S b/arch/mips/lib/csum_partial.S
index 201d82ee4c7..84d5e6a1e76 100644
--- a/arch/mips/lib/csum_partial.S
+++ b/arch/mips/lib/csum_partial.S
@@ -55,20 +55,14 @@
 #define UNIT(unit)  ((unit)*NBYTES)
 
 #define ADDC(sum,reg)						\
-	.set	push;						\
-	.set	noat;						\
 	ADD	sum, reg;					\
 	sltu	v1, sum, reg;					\
 	ADD	sum, v1;					\
-	.set	pop
 
 #define ADDC32(sum,reg)						\
-	.set	push;						\
-	.set	noat;						\
 	addu	sum, reg;					\
 	sltu	v1, sum, reg;					\
 	addu	sum, v1;					\
-	.set	pop
 
 #define CSUM_BIGCHUNK1(src, offset, sum, _t0, _t1, _t2, _t3)	\
 	LOAD	_t0, (offset + UNIT(0))(src);			\
@@ -267,8 +261,6 @@ LEAF(csum_partial)
 1:	ADDC(sum, t1)
 
 	/* fold checksum */
-	.set	push
-	.set	noat
 #ifdef USE_DOUBLE
 	dsll32	v1, sum, 0
 	daddu	sum, v1
@@ -284,7 +276,6 @@ LEAF(csum_partial)
 	srl	sum, sum, 8
 	or	sum, v1
 	andi	sum, 0xffff
-	.set	pop
 1:
 	.set	reorder
 	/* Add the passed partial csum.  */
@@ -664,8 +655,6 @@ EXC(	sb	t0, NBYTES-2(dst), .Ls_exc)
 	ADDC(sum, t2)
 .Ldone:
 	/* fold checksum */
-	.set	push
-	.set	noat
 #ifdef USE_DOUBLE
 	dsll32	v1, sum, 0
 	daddu	sum, v1
@@ -681,7 +670,6 @@ EXC(	sb	t0, NBYTES-2(dst), .Ls_exc)
 	srl	sum, sum, 8
 	or	sum, v1
 	andi	sum, 0xffff
-	.set	pop
 1:
 	.set reorder
 	ADDC32(sum, psum)