[S390] Inline assembly cleanup.

Major cleanup of all s390 inline assemblies. They now have a common
coding style. Quite a few have been shortened, mainly by using register
asm variables. Use of the EX_TABLE macro helps  as well. The atomic ops,
bit ops and locking inlines new use the Q-constraint if a newer gcc
is used.  That results in slightly better code.

Thanks to Christian Borntraeger for proof reading the changes.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 16 insertions, 22 deletions

diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index 438db483035d..1398367b5f68 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -42,18 +42,15 @@ diag210(struct diag210 * addr)
         spin_lock_irqsave(&diag210_lock, flags);
         diag210_tmp = *addr;
 
-        asm volatile (
-                "   lhi   %0,-1\n"
-                "   sam31\n"
-                "   diag  %1,0,0x210\n"
-                "0: ipm   %0\n"
-                "   srl   %0,28\n"
-                "1: sam64\n"
-                ".section __ex_table,\"a\"\n"
-                "    .align 8\n"
-                "    .quad 0b,1b\n"
-                ".previous"
-                : "=&d" (ccode) : "a" (__pa(&diag210_tmp)) : "cc", "memory" );
+        asm volatile(
+                "       lhi     %0,-1\n"
+                "       sam31\n"
+                "       diag    %1,0,0x210\n"
+                "0:     ipm     %0\n"
+                "       srl     %0,28\n"
+                "1:     sam64\n"
+                EX_TABLE(0b,1b)
+                : "=&d" (ccode) : "a" (__pa(&diag210_tmp)) : "cc", "memory");
 
         *addr = diag210_tmp;
         spin_unlock_irqrestore(&diag210_lock, flags);
@@ -66,17 +63,14 @@ diag210(struct diag210 * addr)
 {
         int ccode;
 
-        asm volatile (
-                "   lhi   %0,-1\n"
-                "   diag  %1,0,0x210\n"
-                "0: ipm   %0\n"
-                "   srl   %0,28\n"
+        asm volatile(
+                "       lhi     %0,-1\n"
+                "       diag    %1,0,0x210\n"
+                "0:     ipm     %0\n"
+                "       srl     %0,28\n"
                 "1:\n"
-                ".section __ex_table,\"a\"\n"
-                "    .align 4\n"
-                "    .long 0b,1b\n"
-                ".previous"
-                : "=&d" (ccode) : "a" (__pa(addr)) : "cc", "memory" );
+                EX_TABLE(0b,1b)
+                : "=&d" (ccode) : "a" (__pa(addr)) : "cc", "memory");
 
         return ccode;
 }