ARM: rockchip_defconfig: update by savedefconfig

[firefly-linux-kernel-4.4.55.git] / arch / m68k / mm / hwtest.c

diff --git a/arch/m68k/mm/hwtest.c b/arch/m68k/mm/hwtest.c
index 2a5259fd23ebc532bfc73b6d54ec2d800cd95af0..fb8be4dd38c448d75382bf5a32daf55eff0f4a03 100644 (file)
--- a/arch/m68k/mm/hwtest.c
+++ b/arch/m68k/mm/hwtest.c
@@ -25,32 +25,32 @@
 
 #include <linux/module.h>
 
-int hwreg_present( volatile void *regp )
+int hwreg_present(volatile void *regp)
 {
-    int        ret = 0;
-    unsigned long flags;
-    long       save_sp, save_vbr;
-    long       tmp_vectors[3];
+       int ret = 0;
+       unsigned long flags;
+       long save_sp, save_vbr;
+       long tmp_vectors[3];
 
-    local_irq_save(flags);
-    __asm__ __volatile__
-       (       "movec  %/vbr,%2\n\t"
-               "movel  #Lberr1,%4@(8)\n\t"
-                "movec %4,%/vbr\n\t"
-               "movel  %/sp,%1\n\t"
-               "moveq  #0,%0\n\t"
-               "tstb   %3@\n\t"
+       local_irq_save(flags);
+       __asm__ __volatile__ (
+               "movec %/vbr,%2\n\t"
+               "movel #Lberr1,%4@(8)\n\t"
+               "movec %4,%/vbr\n\t"
+               "movel %/sp,%1\n\t"
+               "moveq #0,%0\n\t"
+               "tstb %3@\n\t"
                "nop\n\t"
-               "moveq  #1,%0\n"
-                "Lberr1:\n\t"
-               "movel  %1,%/sp\n\t"
-               "movec  %2,%/vbr"
+               "moveq #1,%0\n"
+       "Lberr1:\n\t"
+               "movel %1,%/sp\n\t"
+               "movec %2,%/vbr"
                : "=&d" (ret), "=&r" (save_sp), "=&r" (save_vbr)
                : "a" (regp), "a" (tmp_vectors)
-                );
-    local_irq_restore(flags);
+       );
+       local_irq_restore(flags);
 
-    return( ret );
+       return ret;
 }
 EXPORT_SYMBOL(hwreg_present);
 
@@ -58,34 +58,36 @@ EXPORT_SYMBOL(hwreg_present);
  * by a bus error handler. Returns 1 if successful, 0 otherwise.
  */
 
-int hwreg_write( volatile void *regp, unsigned short val )
+int hwreg_write(volatile void *regp, unsigned short val)
 {
-       int             ret;
+       int ret;
        unsigned long flags;
-       long    save_sp, save_vbr;
-       long    tmp_vectors[3];
+       long save_sp, save_vbr;
+       long tmp_vectors[3];
 
        local_irq_save(flags);
-       __asm__ __volatile__
-       (       "movec  %/vbr,%2\n\t"
-               "movel  #Lberr2,%4@(8)\n\t"
-               "movec  %4,%/vbr\n\t"
-               "movel  %/sp,%1\n\t"
-               "moveq  #0,%0\n\t"
-               "movew  %5,%3@\n\t"
-               "nop    \n\t"   /* If this nop isn't present, 'ret' may already be
-                                * loaded with 1 at the time the bus error
-                                * happens! */
-               "moveq  #1,%0\n"
+       __asm__ __volatile__ (
+               "movec %/vbr,%2\n\t"
+               "movel #Lberr2,%4@(8)\n\t"
+               "movec %4,%/vbr\n\t"
+               "movel %/sp,%1\n\t"
+               "moveq #0,%0\n\t"
+               "movew %5,%3@\n\t"
+               "nop\n\t"
+               /*
+                * If this nop isn't present, 'ret' may already be loaded
+                * with 1 at the time the bus error happens!
+                */
+               "moveq #1,%0\n"
        "Lberr2:\n\t"
-               "movel  %1,%/sp\n\t"
-               "movec  %2,%/vbr"
+               "movel %1,%/sp\n\t"
+               "movec %2,%/vbr"
                : "=&d" (ret), "=&r" (save_sp), "=&r" (save_vbr)
                : "a" (regp), "a" (tmp_vectors), "g" (val)
        );
        local_irq_restore(flags);
 
-       return( ret );
+       return ret;
 }
 EXPORT_SYMBOL(hwreg_write);