1 files changed, 7 insertions, 36 deletions

diff --git a/drivers/tty/hvc/hvc_dcc.c b/drivers/tty/hvc/hvc_dcc.c
index 6470f63deb4b..435f6facbc23 100644
--- a/drivers/tty/hvc/hvc_dcc.c
+++ b/drivers/tty/hvc/hvc_dcc.c
@@ -33,54 +33,29 @@
 static inline u32 __dcc_getstatus(void)
 {
         u32 __ret;
-
-        asm("mrc p14, 0, %0, c0, c1, 0  @ read comms ctrl reg"
+        asm volatile("mrc p14, 0, %0, c0, c1, 0 @ read comms ctrl reg"
                 : "=r" (__ret) : : "cc");
 
         return __ret;
 }
 
 
-#if defined(CONFIG_CPU_V7)
 static inline char __dcc_getchar(void)
 {
         char __c;
 
-        asm("get_wait:  mrc p14, 0, pc, c0, c1, 0                          \n\
-                        bne get_wait                                       \n\
-                        mrc p14, 0, %0, c0, c5, 0       @ read comms data reg"
-                : "=r" (__c) : : "cc");
-
-        return __c;
-}
-#else
-static inline char __dcc_getchar(void)
-{
-        char __c;
-
-        asm("mrc p14, 0, %0, c0, c5, 0  @ read comms data reg"
+        asm volatile("mrc p14, 0, %0, c0, c5, 0 @ read comms data reg"
                 : "=r" (__c));
 
         return __c;
 }
-#endif
 
-#if defined(CONFIG_CPU_V7)
-static inline void __dcc_putchar(char c)
-{
-        asm("put_wait:  mrc p14, 0, pc, c0, c1, 0                 \n\
-                        bcs put_wait                              \n\
-                        mcr p14, 0, %0, c0, c5, 0                   "
-        : : "r" (c) : "cc");
-}
-#else
 static inline void __dcc_putchar(char c)
 {
-        asm("mcr p14, 0, %0, c0, c5, 0  @ write a char"
+        asm volatile("mcr p14, 0, %0, c0, c5, 0 @ write a char"
                 : /* no output register */
                 : "r" (c));
 }
-#endif
 
 static int hvc_dcc_put_chars(uint32_t vt, const char *buf, int count)
 {
@@ -90,7 +65,7 @@ static int hvc_dcc_put_chars(uint32_t vt, const char *buf, int count)
                 while (__dcc_getstatus() & DCC_STATUS_TX)
                         cpu_relax();
 
-                __dcc_putchar((char)(buf[i] & 0xFF));
+                __dcc_putchar(buf[i]);
         }
 
         return count;
@@ -100,15 +75,11 @@ static int hvc_dcc_get_chars(uint32_t vt, char *buf, int count)
 {
         int i;
 
-        for (i = 0; i < count; ++i) {
-                int c = -1;
-
+        for (i = 0; i < count; ++i)
                 if (__dcc_getstatus() & DCC_STATUS_RX)
-                        c = __dcc_getchar();
-                if (c < 0)
+                        buf[i] = __dcc_getchar();
+                else
                         break;
-                buf[i] = c;
-        }
 
         return i;
 }