Merge branch 'warning-fixes' into next/fixes-non-critical

These are fixes for compiler warnings that for the most
part were introduced during the 3.8 cycle but are otherwise
harmless.

* warning-fixes:
  scripts/sortextable: silence script output
  ARM: s3c: i2c: add platform_device forward declaration
  ARM: mvebu: allow selecting mvebu without Armada XP
  ARM: pick Versatile by default for !MMU
  ARM: integrator: fix build with INTEGRATOR_AP off
  ARM: integrator/versatile: fix NOMMU warnings
  ARM: sa1100: don't warn about mach/ide.h
  ARM: shmobile: fix defconfig warning on CONFIG_USB
  ARM: w90x900: fix legacy assembly syntax
  ARM: samsung: fix assembly syntax for new gas
  ARM: disable virt_to_bus/virt_to_bus almost everywhere

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

5 files changed, 21 insertions, 21 deletions

diff --git a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S b/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
index 4135de87d1f7..13ed33c69113 100644
--- a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+++ b/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
@@ -40,17 +40,17 @@
                 addeq   \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
                 addne   \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
                 bic     \rd, \rd, #0xff000
-                ldr     \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
+                ldr     \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
                 and     \rd, \rd, #0x00ff0000
                 teq     \rd, #0x00440000                @ is it 2440?
 1004:
-                ldr     \rd, [ \rx, # S3C2410_UFSTAT ]
+                ldr     \rd, [\rx, # S3C2410_UFSTAT]
                 moveq   \rd, \rd, lsr #SHIFT_2440TXF
                 tst     \rd, #S3C2410_UFSTAT_TXFULL
         .endm
 
         .macro  fifo_full_s3c2410 rd, rx
-                ldr     \rd, [ \rx, # S3C2410_UFSTAT ]
+                ldr     \rd, [\rx, # S3C2410_UFSTAT]
                 tst     \rd, #S3C2410_UFSTAT_TXFULL
         .endm
 
@@ -68,18 +68,18 @@
                 addeq   \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
                 addne   \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
                 bic     \rd, \rd, #0xff000
-                ldr     \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
+                ldr     \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
                 and     \rd, \rd, #0x00ff0000
                 teq     \rd, #0x00440000                @ is it 2440?
 
 10000:
-                ldr     \rd, [ \rx, # S3C2410_UFSTAT ]
+                ldr     \rd, [\rx, # S3C2410_UFSTAT]
                 andne   \rd, \rd, #S3C2410_UFSTAT_TXMASK
                 andeq   \rd, \rd, #S3C2440_UFSTAT_TXMASK
         .endm
 
         .macro fifo_level_s3c2410 rd, rx
-                ldr     \rd, [ \rx, # S3C2410_UFSTAT ]
+                ldr     \rd, [\rx, # S3C2410_UFSTAT]
                 and     \rd, \rd, #S3C2410_UFSTAT_TXMASK
         .endm
 
diff --git a/arch/arm/mach-s3c24xx/include/mach/entry-macro.S b/arch/arm/mach-s3c24xx/include/mach/entry-macro.S
index 7615a14773fa..6a21beeba1da 100644
--- a/arch/arm/mach-s3c24xx/include/mach/entry-macro.S
+++ b/arch/arm/mach-s3c24xx/include/mach/entry-macro.S
@@ -31,10 +31,10 @@
 
                 @@ try the interrupt offset register, since it is there
 
-                ldr     \irqstat, [ \base, #INTPND ]
+                ldr     \irqstat, [\base, #INTPND ]
                 teq     \irqstat, #0
                 beq     1002f
-                ldr     \irqnr, [ \base, #INTOFFSET ]
+                ldr     \irqnr, [\base, #INTOFFSET ]
                 mov     \tmp, #1
                 tst     \irqstat, \tmp, lsl \irqnr
                 bne     1001f
diff --git a/arch/arm/mach-s3c24xx/pm-h1940.S b/arch/arm/mach-s3c24xx/pm-h1940.S
index c93bf2db9f4d..6183a688012b 100644
--- a/arch/arm/mach-s3c24xx/pm-h1940.S
+++ b/arch/arm/mach-s3c24xx/pm-h1940.S
@@ -30,4 +30,4 @@
 
 h1940_pm_return:
         mov     r0, #S3C2410_PA_GPIO
-        ldr     pc, [ r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO ]
+        ldr     pc, [r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO]
diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2410.S b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
index dd5b6388a5a5..65200ae72c90 100644
--- a/arch/arm/mach-s3c24xx/sleep-s3c2410.S
+++ b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
@@ -45,9 +45,9 @@ ENTRY(s3c2410_cpu_suspend)
         ldr     r4, =S3C2410_REFRESH
         ldr     r5, =S3C24XX_MISCCR
         ldr     r6, =S3C2410_CLKCON
-        ldr     r7, [ r4 ]              @ get REFRESH (and ensure in TLB)
-        ldr     r8, [ r5 ]              @ get MISCCR (and ensure in TLB)
-        ldr     r9, [ r6 ]              @ get CLKCON (and ensure in TLB)
+        ldr     r7, [r4]                @ get REFRESH (and ensure in TLB)
+        ldr     r8, [r5]                @ get MISCCR (and ensure in TLB)
+        ldr     r9, [r6]                @ get CLKCON (and ensure in TLB)
 
         orr     r7, r7, #S3C2410_REFRESH_SELF   @ SDRAM sleep command
         orr     r8, r8, #S3C2410_MISCCR_SDSLEEP @ SDRAM power-down signals
@@ -61,8 +61,8 @@ ENTRY(s3c2410_cpu_suspend)
         @@ align next bit of code to cache line
         .align  5
 s3c2410_do_sleep:
-        streq   r7, [ r4 ]                      @ SDRAM sleep command
-        streq   r8, [ r5 ]                      @ SDRAM power-down config
-        streq   r9, [ r6 ]                      @ CPU sleep
+        streq   r7, [r4]                        @ SDRAM sleep command
+        streq   r8, [r5]                        @ SDRAM power-down config
+        streq   r9, [r6]                        @ CPU sleep
 1:      beq     1b
         mov     pc, r14
diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2412.S b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
index c82418ed714d..5adaceb7da13 100644
--- a/arch/arm/mach-s3c24xx/sleep-s3c2412.S
+++ b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
@@ -57,12 +57,12 @@ s3c2412_sleep_enter1:
          * retry, as simply returning causes the system to lock.
         */
 
-        ldrne   r9, [ r1 ]
-        strne   r9, [ r1 ]
-        ldrne   r9, [ r2 ]
-        strne   r9, [ r2 ]
-        ldrne   r9, [ r3 ]
-        strne   r9, [ r3 ]
+        ldrne   r9, [r1]
+        strne   r9, [r1]
+        ldrne   r9, [r2]
+        strne   r9, [r2]
+        ldrne   r9, [r3]
+        strne   r9, [r3]
         bne     s3c2412_sleep_enter1
 
         mov     pc, r14