Replace __asm references with __asm__

__asm__ follows gcc's documented syntax and is generally more common
than __asm.  This change is only asthetic and should not affect
functionality.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

diff --git a/board/MAI/AmigaOneG3SE/enet.c b/board/MAI/AmigaOneG3SE/enet.c
index ac969a9e2241c23697b78dc6081607e5fd2d86ee..b9df55c869a4678af0a3a3c26ef4287f966703ba 100644 (file)
--- a/board/MAI/AmigaOneG3SE/enet.c
+++ b/board/MAI/AmigaOneG3SE/enet.c
@@ -297,50 +297,50 @@ static void eth_3com_halt(struct eth_device* dev);
 
 static inline int ETH_INL(struct eth_device* dev, u_long addr)
 {
-    __asm volatile ("eieio");
+       __asm__ volatile ("eieio");
        return le32_to_cpu(*(volatile u32 *)io_to_phys(addr + dev->iobase));
 }
 
 static inline int ETH_INW(struct eth_device* dev, u_long addr)
 {
-    __asm volatile ("eieio");
+       __asm__ volatile ("eieio");
        return le16_to_cpu(*(volatile u16 *)io_to_phys(addr + dev->iobase));
 }
 
 static inline int ETH_INB(struct eth_device* dev, u_long addr)
 {
-    __asm volatile ("eieio");
+       __asm__ volatile ("eieio");
        return *(volatile u8 *)io_to_phys(addr + dev->iobase);
 }
 
 static inline void ETH_OUTB(struct eth_device* dev, int command, u_long addr)
 {
        *(volatile u8 *)io_to_phys(addr + dev->iobase) = command;
-    __asm volatile ("eieio");
+       __asm__ volatile ("eieio");
 }
 
 static inline void ETH_OUTW(struct eth_device* dev, int command, u_long addr)
 {
        *(volatile u16 *)io_to_phys(addr + dev->iobase) = cpu_to_le16(command);
-    __asm volatile ("eieio");
+       __asm__ volatile ("eieio");
 }
 
 static inline void ETH_OUTL(struct eth_device* dev, int command, u_long addr)
 {
        *(volatile u32 *)io_to_phys(addr + dev->iobase) = cpu_to_le32(command);
-    __asm volatile ("eieio");
+       __asm__ volatile ("eieio");
 }
 
 static inline int ETH_STATUS(struct eth_device* dev)
 {
-    __asm volatile ("eieio");
+       __asm__ volatile ("eieio");
        return le16_to_cpu(*(volatile u16 *)io_to_phys(EL3_STATUS + dev->iobase));
 }
 
 static inline void ETH_CMD(struct eth_device* dev, int command)
 {
        *(volatile u16 *)io_to_phys(EL3_CMD + dev->iobase) = cpu_to_le16(command);
-    __asm volatile ("eieio");
+       __asm__ volatile ("eieio");
 }
 
 /* Command register is always in the same spot in all the register windows */

diff --git a/board/MAI/AmigaOneG3SE/flash_new.c b/board/MAI/AmigaOneG3SE/flash_new.c
index 7b7ea1697ae7ae350bfe2bd0a4990eb9f0dae008..9beb04828d4785d5330f25842b5a4c7044845c12 100644 (file)
--- a/board/MAI/AmigaOneG3SE/flash_new.c
+++ b/board/MAI/AmigaOneG3SE/flash_new.c
@@ -153,14 +153,14 @@ static ulong flash_get_size (ulong addr, flash_info_t *info)
 
        /* Write auto select command: read Manufacturer ID */
        x[0x0555] =  0xAA;
-       __asm volatile ("sync\n eieio");
+       __asm__ volatile ("sync\n eieio");
        x[0x02AA] =  0x55;
-       __asm volatile ("sync\n eieio");
+       __asm__ volatile ("sync\n eieio");
        x[0x0555] =  0x90;
-       __asm volatile ("sync\n eieio");
+       __asm__ volatile ("sync\n eieio");
 
        value = x[0];
-       __asm volatile ("sync\n eieio");
+       __asm__ volatile ("sync\n eieio");
 
        DEBUGF("Manuf. ID @ 0x%08lx: 0x%08x\n", (ulong)addr, value);
 
@@ -186,7 +186,7 @@ static ulong flash_get_size (ulong addr, flash_info_t *info)
        }
 
        value = x[1];
-       __asm volatile ("sync\n eieio");
+       __asm__ volatile ("sync\n eieio");
 
        DEBUGF("Device ID @ 0x%08lx: 0x%08x\n", addr+1, value);
 

diff --git a/board/MAI/AmigaOneG3SE/serial.c b/board/MAI/AmigaOneG3SE/serial.c
index 88039f3d00aa2a7ee5da36ffd54a104cb765e06b..84a913effb16973e5da3ade91c8c6f6f48edabff 100644 (file)
--- a/board/MAI/AmigaOneG3SE/serial.c
+++ b/board/MAI/AmigaOneG3SE/serial.c
@@ -75,17 +75,17 @@ void serial_init (void)
        /* COM_WRITE_BYTE(LINE_CONTROL, 0x83); */
        /* COM_WRITE_BYTE(DIVISOR_LATCH_LSB, (uint8)(clock_divisor & 0xFF)); */
        /* COM_WRITE_BYTE(DIVISOR_LATCH_MSB, (uint8)(clock_divisor >> 8)); */
-       /* __asm("eieio"); */
+       /* __asm__("eieio"); */
 
        /*  Set 8-N-1 */
        COM_WRITE_BYTE (LINE_CONTROL, 0x03);
-       __asm ("eieio");
+       __asm__ ("eieio");
 
        /*  Disable FIFO */
        COM_WRITE_BYTE (MODEM_CONTROL, 0x03);
        COM_WRITE_BYTE (FIFO_CONTROL, 0x07);
 
-       __asm ("eieio");
+       __asm__ ("eieio");
        serial_init_done = 1;
 }
 

diff --git a/board/MAI/AmigaOneG3SE/via686.c b/board/MAI/AmigaOneG3SE/via686.c
index 2427ce5713cee69b730d0d3109b31ccdd79f6946..752a464d67f07cd1cede08b0dff7a59d9bc8fb68 100644 (file)
--- a/board/MAI/AmigaOneG3SE/via686.c
+++ b/board/MAI/AmigaOneG3SE/via686.c
@@ -211,7 +211,7 @@ void via_cfgfunc_via686(struct pci_controller *host, pci_dev_t dev, struct pci_c
     }
 }
 
-__asm         ("    .globl via_calibrate_time_base \n"
+__asm__       ("    .globl via_calibrate_time_base \n"
               "via_calibrate_time_base:           \n"
               "   lis     9, 0xfe00               \n"
               "   li      0, 0x00                 \n"

diff --git a/board/trab/vfd.c b/board/trab/vfd.c
index eb506f39b66d1f20d56dc4144cf4fd56cf92f9bd..37d3aa48e7415aa75a911ba87961c5fdfcd9badc 100644 (file)
--- a/board/trab/vfd.c
+++ b/board/trab/vfd.c
@@ -369,7 +369,7 @@ int vfd_init_clocks (void)
        gpio->PCCON = (gpio->PCCON & 0xFFFFFF00);       /* configure GPC0...GPC3 as inputs */
        /* allow signals to settle */
        for (i=0; i<10000; i++) /* udelay isn't working yet at this point! */
-               __asm("NOP");
+               __asm__("NOP");
        vfd_board_id = (~gpio->PCDAT) & 0x000F; /* read GPC0...GPC3 port pins */
 
        VFD_DISABLE;                            /* activate blank for the vfd */

diff --git a/cpu/ixp/npe/IxFeatureCtrl.c b/cpu/ixp/npe/IxFeatureCtrl.c
index e02aabfb40724d714aa530488b4b4c63c2eb935a..2e196a19aa6778324f8be2a60731b7645aeade0d 100644 (file)
--- a/cpu/ixp/npe/IxFeatureCtrl.c
+++ b/cpu/ixp/npe/IxFeatureCtrl.c
@@ -317,7 +317,7 @@ ixFeatureCtrlProductIdRead ()
   /* Use ARM instruction to move register0 from coprocessor to ARM register */ 
     
 #ifndef __wince
-    __asm("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(pdId) :); 
+    __asm__("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(pdId) :);
 #else
       
 #ifndef IN_KERNEL

diff --git a/tools/updater/flash_hw.c b/tools/updater/flash_hw.c
index 8af4b454ec03c9d9b06eedb0cd5ae39e26cf0a89..b5058b3abe77dbea84488f03a8b32225f3004653 100644 (file)
--- a/tools/updater/flash_hw.c
+++ b/tools/updater/flash_hw.c
@@ -153,14 +153,14 @@ static ulong flash_get_size (ulong addr, flash_info_t *info)
 
        /* Write auto select command: read Manufacturer ID */
        x[0x0555] =  0xAA;
-       __asm volatile ("sync\n eieio");
+       __asm__ volatile ("sync\n eieio");
        x[0x02AA] =  0x55;
-       __asm volatile ("sync\n eieio");
+       __asm__ volatile ("sync\n eieio");
        x[0x0555] =  0x90;
-       __asm volatile ("sync\n eieio");
+       __asm__ volatile ("sync\n eieio");
 
        value = x[0];
-       __asm volatile ("sync\n eieio");
+       __asm__ volatile ("sync\n eieio");
 
        DEBUGF("Manuf. ID @ 0x%08lx: 0x%08x\n", (ulong)addr, value);
 
@@ -186,7 +186,7 @@ static ulong flash_get_size (ulong addr, flash_info_t *info)
        }
 
        value = x[1];
-       __asm volatile ("sync\n eieio");
+       __asm__ volatile ("sync\n eieio");
 
        DEBUGF("Device ID @ 0x%08lx: 0x%08x\n", addr+1, value);