From aef3fb76aa1390ef864db888d06d8fcd5510df2d Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 30 Apr 2014 01:17:19 +0200 Subject: [PATCH] MIPS: math-emu: Nuke alternative names for IEEE-754 rounding modes. Signed-off-by: Ralf Baechle --- arch/mips/math-emu/dp_sqrt.c | 2 +- arch/mips/math-emu/ieee754.h | 4 ---- arch/mips/math-emu/sp_sqrt.c | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/mips/math-emu/dp_sqrt.c b/arch/mips/math-emu/dp_sqrt.c index 109878a57f12..0384c094b1aa 100644 --- a/arch/mips/math-emu/dp_sqrt.c +++ b/arch/mips/math-emu/dp_sqrt.c @@ -139,7 +139,7 @@ union ieee754dp ieee754dp_sqrt(union ieee754dp x) oldcsr.sx |= IEEE754_INEXACT; switch (oldcsr.rm) { - case IEEE754_RP: + case IEEE754_RU: y.bits += 1; /* drop through */ case IEEE754_RN: diff --git a/arch/mips/math-emu/ieee754.h b/arch/mips/math-emu/ieee754.h index fb2fb6b89273..2fa939c612f6 100644 --- a/arch/mips/math-emu/ieee754.h +++ b/arch/mips/math-emu/ieee754.h @@ -133,10 +133,6 @@ enum { #define IEEE754_RD 2 /* round toward -Infinity */ #define IEEE754_RU 3 /* round toward +Infinity */ -/* other naming */ -#define IEEE754_RM IEEE754_RD -#define IEEE754_RP IEEE754_RU - /* "normal" comparisons */ static inline int ieee754sp_eq(union ieee754sp x, union ieee754sp y) diff --git a/arch/mips/math-emu/sp_sqrt.c b/arch/mips/math-emu/sp_sqrt.c index 33b3e0001e9e..94f5befa1d70 100644 --- a/arch/mips/math-emu/sp_sqrt.c +++ b/arch/mips/math-emu/sp_sqrt.c @@ -100,7 +100,7 @@ union ieee754sp ieee754sp_sqrt(union ieee754sp x) if (ix != 0) { ieee754_setcx(IEEE754_INEXACT); switch (ieee754_csr.rm) { - case IEEE754_RP: + case IEEE754_RU: q += 2; break; case IEEE754_RN: -- 2.20.1