Commit 24cae793 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

m68k: Reformat arch/m68k/mm/hwtest.c

No functional changes
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent e4dc601b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <linux/module.h> #include <linux/module.h>
int hwreg_present( volatile void *regp ) int hwreg_present(volatile void *regp)
{ {
int ret = 0; int ret = 0;
unsigned long flags; unsigned long flags;
...@@ -33,8 +33,8 @@ int hwreg_present( volatile void *regp ) ...@@ -33,8 +33,8 @@ int hwreg_present( volatile void *regp )
long tmp_vectors[3]; long tmp_vectors[3];
local_irq_save(flags); local_irq_save(flags);
__asm__ __volatile__ __asm__ __volatile__ (
( "movec %/vbr,%2\n\t" "movec %/vbr,%2\n\t"
"movel #Lberr1,%4@(8)\n\t" "movel #Lberr1,%4@(8)\n\t"
"movec %4,%/vbr\n\t" "movec %4,%/vbr\n\t"
"movel %/sp,%1\n\t" "movel %/sp,%1\n\t"
...@@ -50,7 +50,7 @@ int hwreg_present( volatile void *regp ) ...@@ -50,7 +50,7 @@ int hwreg_present( volatile void *regp )
); );
local_irq_restore(flags); local_irq_restore(flags);
return( ret ); return ret;
} }
EXPORT_SYMBOL(hwreg_present); EXPORT_SYMBOL(hwreg_present);
...@@ -58,7 +58,7 @@ EXPORT_SYMBOL(hwreg_present); ...@@ -58,7 +58,7 @@ EXPORT_SYMBOL(hwreg_present);
* by a bus error handler. Returns 1 if successful, 0 otherwise. * 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; unsigned long flags;
...@@ -66,16 +66,18 @@ int hwreg_write( volatile void *regp, unsigned short val ) ...@@ -66,16 +66,18 @@ int hwreg_write( volatile void *regp, unsigned short val )
long tmp_vectors[3]; long tmp_vectors[3];
local_irq_save(flags); local_irq_save(flags);
__asm__ __volatile__ __asm__ __volatile__ (
( "movec %/vbr,%2\n\t" "movec %/vbr,%2\n\t"
"movel #Lberr2,%4@(8)\n\t" "movel #Lberr2,%4@(8)\n\t"
"movec %4,%/vbr\n\t" "movec %4,%/vbr\n\t"
"movel %/sp,%1\n\t" "movel %/sp,%1\n\t"
"moveq #0,%0\n\t" "moveq #0,%0\n\t"
"movew %5,%3@\n\t" "movew %5,%3@\n\t"
"nop \n\t" /* If this nop isn't present, 'ret' may already be "nop\n\t"
* loaded with 1 at the time the bus error /*
* happens! */ * If this nop isn't present, 'ret' may already be loaded
* with 1 at the time the bus error happens!
*/
"moveq #1,%0\n" "moveq #1,%0\n"
"Lberr2:\n\t" "Lberr2:\n\t"
"movel %1,%/sp\n\t" "movel %1,%/sp\n\t"
...@@ -85,7 +87,7 @@ int hwreg_write( volatile void *regp, unsigned short val ) ...@@ -85,7 +87,7 @@ int hwreg_write( volatile void *regp, unsigned short val )
); );
local_irq_restore(flags); local_irq_restore(flags);
return( ret ); return ret;
} }
EXPORT_SYMBOL(hwreg_write); EXPORT_SYMBOL(hwreg_write);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment