[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, 9 insertions, 22 deletions

diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 985d1613baaa..31e335751d6d 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -100,13 +100,12 @@ service_call(sclp_cmdw_t command, void *sccb)
 {
         int cc;
 
-        __asm__ __volatile__(
-                "   .insn rre,0xb2200000,%1,%2\n"  /* servc %1,%2 */
-                "   ipm   %0\n"
-                "   srl   %0,28"
-                : "=&d" (cc)
-                : "d" (command), "a" (__pa(sccb))
-                : "cc", "memory" );
+        asm volatile(
+                "       .insn   rre,0xb2200000,%1,%2\n"  /* servc %1,%2 */
+                "       ipm     %0\n"
+                "       srl     %0,28"
+                : "=&d" (cc) : "d" (command), "a" (__pa(sccb))
+                : "cc", "memory");
         if (cc == 3)
                 return -EIO;
         if (cc == 2)
@@ -360,16 +359,6 @@ sclp_interrupt_handler(struct pt_regs *regs, __u16 code)
         sclp_process_queue();
 }
 
-/* Return current Time-Of-Day clock. */
-static inline u64
-sclp_get_clock(void)
-{
-        u64 result;
-
-        asm volatile ("STCK 0(%1)" : "=m" (result) : "a" (&(result)) : "cc");
-        return result;
-}
-
 /* Convert interval in jiffies to TOD ticks. */
 static inline u64
 sclp_tod_from_jiffies(unsigned long jiffies)
@@ -382,7 +371,6 @@ sclp_tod_from_jiffies(unsigned long jiffies)
 void
 sclp_sync_wait(void)
 {
-        unsigned long psw_mask;
         unsigned long flags;
         unsigned long cr0, cr0_sync;
         u64 timeout;
@@ -392,7 +380,7 @@ sclp_sync_wait(void)
         timeout = 0;
         if (timer_pending(&sclp_request_timer)) {
                 /* Get timeout TOD value */
-                timeout = sclp_get_clock() +
+                timeout = get_clock() +
                           sclp_tod_from_jiffies(sclp_request_timer.expires -
                                                 jiffies);
         }
@@ -406,13 +394,12 @@ sclp_sync_wait(void)
         cr0_sync |= 0x00000200;
         cr0_sync &= 0xFFFFF3AC;
         __ctl_load(cr0_sync, 0, 0);
-        asm volatile ("STOSM 0(%1),0x01"
-                      : "=m" (psw_mask) : "a" (&psw_mask) : "memory");
+        __raw_local_irq_stosm(0x01);
         /* Loop until driver state indicates finished request */
         while (sclp_running_state != sclp_running_state_idle) {
                 /* Check for expired request timer */
                 if (timer_pending(&sclp_request_timer) &&
-                    sclp_get_clock() > timeout &&
+                    get_clock() > timeout &&
                     del_timer(&sclp_request_timer))
                         sclp_request_timer.function(sclp_request_timer.data);
                 barrier();