MIPS: math-emu: Nuke alternative names for IEEE-754 rounding modes.

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

diff --git a/arch/mips/math-emu/dp_sqrt.c b/arch/mips/math-emu/dp_sqrt.c
index 109878a57f12e9ff0e66ce0fdc56d4818e578173..0384c094b1aa8036be1b184bcb791e5a4f23cfaf 100644 (file)
--- 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 fb2fb6b892736d9e9790bd9f8ee44ee4525f601b..2fa939c612f6d0c725c9cd820544e4dd8eb04909 100644 (file)
--- 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 33b3e0001e9e41dab305be8b90ccf9e3a12195fd..94f5befa1d7080ddc38c43e22b015978a3d0b5cc 100644 (file)
--- 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: