ARM: 6451/1: sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c.

This patch fixes checkpatch.pl issues in
arch/arm/mach-sa1100/cpu-sa1110.c.

Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 13 insertions, 11 deletions

diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c
index 8251af277c1a..675bf8ef97e8 100644
--- a/arch/arm/mach-sa1100/cpu-sa1110.c
+++ b/arch/arm/mach-sa1100/cpu-sa1110.c
@@ -185,11 +185,13 @@ sdram_calculate_timing(struct sdram_info *sd, u_int cpu_khz,
                 sd->mdrefr |= MDREFR_K1DB2;
 
         /* initial number of '1's in MDCAS + 1 */
-        set_mdcas(sd->mdcas, sd_khz >= 62000, ns_to_cycles(sdram->trcd, mem_khz));
+        set_mdcas(sd->mdcas, sd_khz >= 62000,
+                ns_to_cycles(sdram->trcd, mem_khz));
 
 #ifdef DEBUG
-        printk("MDCNFG: %08x MDREFR: %08x MDCAS0: %08x MDCAS1: %08x MDCAS2: %08x\n",
-                sd->mdcnfg, sd->mdrefr, sd->mdcas[0], sd->mdcas[1], sd->mdcas[2]);
+        printk(KERN_DEBUG "MDCNFG: %08x MDREFR: %08x MDCAS0: %08x MDCAS1: %08x MDCAS2: %08x\n",
+                sd->mdcnfg, sd->mdrefr, sd->mdcas[0], sd->mdcas[1],
+                sd->mdcas[2]);
 #endif
 }
 
@@ -218,7 +220,7 @@ sdram_update_refresh(u_int cpu_khz, struct sdram_params *sdram)
 
 #ifdef DEBUG
         mdelay(250);
-        printk("new dri value = %d\n", dri);
+        printk(KERN_DEBUG "new dri value = %d\n", dri);
 #endif
 
         sdram_set_refresh(dri);
@@ -237,7 +239,7 @@ static int sa1110_target(struct cpufreq_policy *policy,
         unsigned long flags;
         unsigned int ppcr, unused;
 
-        switch(relation){
+        switch (relation) {
         case CPUFREQ_RELATION_L:
                 ppcr = sa11x0_freq_to_ppcr(target_freq);
                 if (sa11x0_ppcr_to_freq(ppcr) > policy->max)
@@ -285,11 +287,10 @@ static int sa1110_target(struct cpufreq_policy *policy,
          * We wait 20ms to be safe.
          */
         sdram_set_refresh(2);
-        if (!irqs_disabled()) {
+        if (!irqs_disabled())
                 msleep(20);
-        } else {
+        else
                 mdelay(20);
-        }
 
         /*
          * Reprogram the DRAM timings with interrupts disabled, and
@@ -300,7 +301,7 @@ static int sa1110_target(struct cpufreq_policy *policy,
         local_irq_save(flags);
         asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
         udelay(10);
-        __asm__ __volatile__("                                  \n\
+        __asm__ __volatile__("\n\
                 b       2f                                      \n\
                 .align  5                                       \n\
 1:              str     %3, [%1, #0]            @ MDCNFG        \n\
@@ -356,7 +357,8 @@ static struct sdram_params *sa1110_find_sdram(const char *name)
 {
         struct sdram_params *sdram;
 
-        for (sdram = sdram_tbl; sdram < sdram_tbl + ARRAY_SIZE(sdram_tbl); sdram++)
+        for (sdram = sdram_tbl; sdram < sdram_tbl + ARRAY_SIZE(sdram_tbl);
+             sdram++)
                 if (strcmp(name, sdram->name) == 0)
                         return sdram;
 
@@ -381,7 +383,7 @@ static int __init sa1110_clk_init(void)
                 if (machine_is_h3100())
                         name = "KM416S4030CT";
                 if (machine_is_jornada720())
-                        name = "K4S281632B-1H";
+                        name = "K4S281632B-1H";
                 if (machine_is_nanoengine())
                         name = "MT48LC8M16A2TG-75";
         }