Blackfin arch: use the [CS]SYNC() macros which include anomaly workarounds rather than __builtin_bfin_[cs]sync()

Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>

6 files changed, 15 insertions, 15 deletions

diff --git a/arch/blackfin/oprofile/op_blackfin.h b/arch/blackfin/oprofile/op_blackfin.h
index f88f446c814f..05dd08c9d154 100644
--- a/arch/blackfin/oprofile/op_blackfin.h
+++ b/arch/blackfin/oprofile/op_blackfin.h
@@ -68,7 +68,7 @@ static inline unsigned int ctr_read(void)
         unsigned int tmp;
 
         tmp = bfin_read_PFCTL();
-        __builtin_bfin_csync();
+        CSYNC();
 
         return tmp;
 }
@@ -76,21 +76,21 @@ static inline unsigned int ctr_read(void)
 static inline void ctr_write(unsigned int val)
 {
         bfin_write_PFCTL(val);
-        __builtin_bfin_csync();
+        CSYNC();
 }
 
 static inline void count_read(unsigned int *count)
 {
         count[0] = bfin_read_PFCNTR0();
         count[1] = bfin_read_PFCNTR1();
-        __builtin_bfin_csync();
+        CSYNC();
 }
 
 static inline void count_write(unsigned int *count)
 {
         bfin_write_PFCNTR0(count[0]);
         bfin_write_PFCNTR1(count[1]);
-        __builtin_bfin_csync();
+        CSYNC();
 }
 
 extern int pm_overflow_handler(int irq, struct pt_regs *regs);
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index 66c92bc36f3d..1e79ee605d93 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -173,12 +173,12 @@ void kgdb_put_debug_char(int chr)
                 uart = &bfin_serial_ports[CONFIG_KGDB_UART_PORT];
         
         while (!(UART_GET_LSR(uart) & THRE)) {
-                __builtin_bfin_ssync();
+                SSYNC();
         }
         UART_PUT_LCR(uart, UART_GET_LCR(uart)&(~DLAB));
-        __builtin_bfin_ssync();
+        SSYNC();
         UART_PUT_CHAR(uart, (unsigned char)chr);
-        __builtin_bfin_ssync();
+        SSYNC();
 }
 
 int kgdb_get_debug_char(void)
@@ -192,12 +192,12 @@ int kgdb_get_debug_char(void)
                 uart = &bfin_serial_ports[CONFIG_KGDB_UART_PORT];
         
         while(!(UART_GET_LSR(uart) & DR)) {
-                __builtin_bfin_ssync();
+                SSYNC();
         }
         UART_PUT_LCR(uart, UART_GET_LCR(uart)&(~DLAB));
-        __builtin_bfin_ssync();
+        SSYNC();
         chr = UART_GET_CHAR(uart);
-        __builtin_bfin_ssync();
+        SSYNC();
 
         return chr;
 }
@@ -1203,7 +1203,7 @@ static int __init bfin_serial_init(void)
                         IRQF_DISABLED, "BFIN_UART_RX", uart);
                 pr_info("Request irq for kgdb uart port\n");
                 UART_PUT_IER(uart, UART_GET_IER(uart) | ERBFI);
-                __builtin_bfin_ssync();
+                SSYNC();
                 t.c_cflag = CS8|B57600;
                 t.c_iflag = 0;
                 t.c_oflag = 0;
diff --git a/include/asm-blackfin/mach-bf533/cdefBF532.h b/include/asm-blackfin/mach-bf533/cdefBF532.h
index 74f967b235e2..67a6dc49c521 100644
--- a/include/asm-blackfin/mach-bf533/cdefBF532.h
+++ b/include/asm-blackfin/mach-bf533/cdefBF532.h
@@ -65,7 +65,7 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)
         bfin_write32(SIC_IWR, IWR_ENABLE(0));
 
         bfin_write16(VR_CTL, val);
-        __builtin_bfin_ssync();
+        SSYNC();
 
         local_irq_save(flags);
         asm("IDLE;");
diff --git a/include/asm-blackfin/mach-bf537/cdefBF534.h b/include/asm-blackfin/mach-bf537/cdefBF534.h
index 84e58fa73dce..5dab41fb9c75 100644
--- a/include/asm-blackfin/mach-bf537/cdefBF534.h
+++ b/include/asm-blackfin/mach-bf537/cdefBF534.h
@@ -57,7 +57,7 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)
         bfin_write32(SIC_IWR, IWR_ENABLE(0));
 
         bfin_write16(VR_CTL, val);
-        __builtin_bfin_ssync();
+        SSYNC();
 
         local_irq_save(flags);
         asm("IDLE;");
diff --git a/include/asm-blackfin/mach-bf548/cdefBF54x_base.h b/include/asm-blackfin/mach-bf548/cdefBF54x_base.h
index cdf29e75ea59..10475bbfc7dd 100644
--- a/include/asm-blackfin/mach-bf548/cdefBF54x_base.h
+++ b/include/asm-blackfin/mach-bf548/cdefBF54x_base.h
@@ -60,7 +60,7 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)
         bfin_write32(SIC_IWR2, 0);
 
         bfin_write16(VR_CTL, val);
-        __builtin_bfin_ssync();
+        SSYNC();
 
         local_irq_save(flags);
         asm("IDLE;");
diff --git a/include/asm-blackfin/mach-bf561/cdefBF561.h b/include/asm-blackfin/mach-bf561/cdefBF561.h
index 73d4d65249cd..2efcd2c663ab 100644
--- a/include/asm-blackfin/mach-bf561/cdefBF561.h
+++ b/include/asm-blackfin/mach-bf561/cdefBF561.h
@@ -67,7 +67,7 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)
         bfin_write32(SICA_IWR1, 0);
 
         bfin_write16(VR_CTL, val);
-        __builtin_bfin_ssync();
+        SSYNC();
 
         local_irq_save(flags);
         asm("IDLE;");