1 files changed, 28 insertions, 25 deletions

diff --git a/arch/mips/math-emu/sp_add.c b/arch/mips/math-emu/sp_add.c
index db4d89beada6..a0bc95cea1cc 100644
--- a/arch/mips/math-emu/sp_add.c
+++ b/arch/mips/math-emu/sp_add.c
@@ -5,8 +5,6 @@
  * MIPS floating point support
  * Copyright (C) 1994-2000 Algorithmics Ltd.
  *
- * ########################################################################
- *
  *  This program is free software; you can distribute it and/or modify it
  *  under the terms of the GNU General Public License (Version 2) as
  *  published by the Free Software Foundation.
@@ -18,16 +16,15 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * ########################################################################
+ *  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  */
 
-
 #include "ieee754sp.h"
 
 union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
 {
+        int s;
+
         COMPXSP;
         COMPYSP;
 
@@ -68,9 +65,9 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
                 return x;
 
 
-                /* Infinity handling
-                 */
-
+        /*
+         * Infinity handling
+         */
         case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):
                 if (xs == ys)
                         return x;
@@ -87,15 +84,14 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
         case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM):
                 return x;
 
-                /* Zero handling
-                 */
-
+        /*
+         * Zero handling
+         */
         case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):
                 if (xs == ys)
                         return x;
                 else
-                        return ieee754sp_zero(ieee754_csr.rm ==
-                                              IEEE754_RD);
+                        return ieee754sp_zero(ieee754_csr.rm == IEEE754_RD);
 
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO):
         case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO):
@@ -108,6 +104,8 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
         case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_DNORM):
                 SPDNORMX;
 
+                /* FALL THROUGH */
+
         case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_DNORM):
                 SPDNORMY;
                 break;
@@ -122,27 +120,32 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
         assert(xm & SP_HIDDEN_BIT);
         assert(ym & SP_HIDDEN_BIT);
 
-        /* provide guard,round and stick bit space */
+        /*
+         * Provide guard, round and stick bit space.
+         */
         xm <<= 3;
         ym <<= 3;
 
         if (xe > ye) {
-                /* have to shift y fraction right to align
+                /*
+                 * Have to shift y fraction right to align.
                  */
-                int s = xe - ye;
+                s = xe - ye;
                 SPXSRSYn(s);
         } else if (ye > xe) {
-                /* have to shift x fraction right to align
+                /*
+                 * Have to shift x fraction right to align.
                  */
-                int s = ye - xe;
+                s = ye - xe;
                 SPXSRSXn(s);
         }
         assert(xe == ye);
         assert(xe <= SP_EMAX);
 
         if (xs == ys) {
-                /* generate 28 bit result of adding two 27 bit numbers
-                 * leaving result in xm,xs,xe
+                /*
+                 * Generate 28 bit result of adding two 27 bit numbers
+                 * leaving result in xm, xs and xe.
                  */
                 xm = xm + ym;
                 xe = xe;
@@ -162,15 +165,15 @@ union ieee754sp ieee754sp_add(union ieee754sp x, union ieee754sp y)
                         xs = ys;
                 }
                 if (xm == 0)
-                        return ieee754sp_zero(ieee754_csr.rm ==
-                                              IEEE754_RD);
+                        return ieee754sp_zero(ieee754_csr.rm == IEEE754_RD);
 
-                /* normalize in extended single precision */
+                /*
+                 * Normalize in extended single precision
+                 */
                 while ((xm >> (SP_FBITS + 3)) == 0) {
                         xm <<= 1;
                         xe--;
                 }
-
         }
 
         return ieee754sp_format(xs, xe, xm);