Fix some checkpatch warnings in calls to debug()

Fix up some incorrect code style in calls to functions in the log.h
header, mostly debug().

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 59062ca654e27174e6e5af0fcafc2c09e41cd520..a9bcb6614fc644319563e316c4220d40fd897e8b 100644 (file)
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -53,8 +53,8 @@ static void boot_jump_linux(bootm_headers_t *images)
 
        kernel = (void (*)(bd_t *, ulong, ulong, ulong,
                           ulong, ulong, ulong))images->ep;
-       debug ("## Transferring control to Linux (at address %08lx) ...\n",
-               (ulong)kernel);
+       debug("## Transferring control to Linux (at address %08lx) ...\n",
+             (ulong)kernel);
 
        bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
@@ -81,7 +81,7 @@ static void boot_jump_linux(bootm_headers_t *images)
                 *   r8: 0
                 *   r9: 0
                 */
-               debug ("   Booting using OF flat tree...\n");
+               debug("   Booting using OF flat tree...\n");
                WATCHDOG_RESET ();
                (*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC,
                           env_get_bootm_mapsize(), 0, 0);
@@ -105,7 +105,7 @@ static void boot_jump_linux(bootm_headers_t *images)
                ulong initrd_end = images->initrd_end;
                bd_t *kbd = images->kbd;
 
-               debug ("   Booting using board info...\n");
+               debug("   Booting using board info...\n");
                WATCHDOG_RESET ();
                (*kernel) (kbd, initrd_start, initrd_end,
                           cmd_start, cmd_end, 0, 0);
@@ -149,7 +149,7 @@ void arch_lmb_reserve(struct lmb *lmb)
         * pointer.
         */
        sp = get_sp();
-       debug ("## Current stack ends at 0x%08lx\n", sp);
+       debug("## Current stack ends at 0x%08lx\n", sp);
 
        /* adjust sp by 4K to be safe */
        sp -= 4096;

diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index da97495664064f58c89a7ff6564fd408a1e1c583..3e804c85c4a32e852b6178b615db860218043ff9 100644 (file)
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -303,7 +303,7 @@ void pci_init_board(void)
        porpllsr = in_be32(&gur->porpllsr);
        io_sel = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >> 19;
 
-       debug ("   pci_init_board: devdisr=%x, io_sel=%x\n", devdisr, io_sel);
+       debug("   %s: devdisr=%x, io_sel=%x\n", __func__, devdisr, io_sel);
 
        pci_speed = 66666000;
        pci_32 = 1;

diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
index d053eaeec34f4a95844d489e031df53bb2cfbe0f..4163fd2ccf2e3bc9dd2b12f099d3967149bf08af 100644 (file)
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -49,7 +49,7 @@ int dram_init(void)
        dram_size = fixed_sdram ();
 #endif
 
-       debug ("    DDR: ");
+       debug("    DDR: ");
        gd->ram_size = dram_size;
 
        return 0;

diff --git a/cmd/flash.c b/cmd/flash.c
index 452b040dbca7c63d69b04bd26c18b653bcbe73e0..77979e44129b42e8918739fd7705013a60a4944f 100644 (file)
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -411,13 +411,12 @@ int flash_sect_erase(ulong addr_first, ulong addr_last)
                     ++bank, ++info) {
                        if (s_first[bank]>=0) {
                                erased += s_last[bank] - s_first[bank] + 1;
-                               debug ("Erase Flash from 0x%08lx to 0x%08lx "
-                                       "in Bank # %ld ",
-                                       info->start[s_first[bank]],
-                                       (s_last[bank] == info->sector_count) ?
-                                               info->start[0] + info->size - 1:
-                                               info->start[s_last[bank]+1] - 1,
-                                       bank+1);
+                               debug("Erase Flash from 0x%08lx to 0x%08lx in Bank # %ld ",
+                                     info->start[s_first[bank]],
+                                     (s_last[bank] == info->sector_count) ?
+                                     info->start[0] + info->size - 1 :
+                                     info->start[s_last[bank] + 1] - 1,
+                                     bank + 1);
                                rcode = flash_erase(info, s_first[bank],
                                                    s_last[bank]);
                        }
@@ -612,9 +611,9 @@ int flash_sect_protect(int p, ulong addr_first, ulong addr_last)
                        }
 
                        if (s_first[bank]>=0 && s_first[bank]<=s_last[bank]) {
-                               debug ("%sProtecting sectors %d..%d in bank %ld\n",
-                                       p ? "" : "Un-",
-                                       s_first[bank], s_last[bank], bank+1);
+                               debug("%sProtecting sectors %d..%d in bank %ld\n",
+                                     p ? "" : "Un-", s_first[bank],
+                                     s_last[bank], bank + 1);
                                protected += s_last[bank] - s_first[bank] + 1;
                                for (i=s_first[bank]; i<=s_last[bank]; ++i) {
 #if defined(CONFIG_SYS_FLASH_PROTECTION)

diff --git a/cmd/source.c b/cmd/source.c
index 5b0b79aadba568adbf49bf9f6a4eb5115cb49bb5..cd58924eeba4499aef2623c84dc6bceb1106badf 100644 (file)
--- a/cmd/source.c
+++ b/cmd/source.c
@@ -154,7 +154,7 @@ int image_source_script(ulong addr, const char *fit_uname)
                return 1;
        }
 
-       debug ("** Script length: %ld\n", len);
+       debug("** Script length: %ld\n", len);
        return run_command_list((char *)data, len, 0);
 }
 
@@ -170,16 +170,16 @@ static int do_source(struct cmd_tbl *cmdtp, int flag, int argc,
        /* Find script image */
        if (argc < 2) {
                addr = CONFIG_SYS_LOAD_ADDR;
-               debug ("*  source: default load address = 0x%08lx\n", addr);
+               debug("*  source: default load address = 0x%08lx\n", addr);
 #if defined(CONFIG_FIT)
        } else if (fit_parse_subimage(argv[1], image_load_addr, &addr,
                                      &fit_uname)) {
-               debug ("*  source: subimage '%s' from FIT image at 0x%08lx\n",
-                               fit_uname, addr);
+               debug("*  source: subimage '%s' from FIT image at 0x%08lx\n",
+                     fit_uname, addr);
 #endif
        } else {
                addr = simple_strtoul(argv[1], NULL, 16);
-               debug ("*  source: cmdline image address = 0x%08lx\n", addr);
+               debug("*  source: cmdline image address = 0x%08lx\n", addr);
        }
 
        printf ("## Executing script at %08lx\n", addr);

diff --git a/common/flash.c b/common/flash.c
index cde648d4b8881bce11d109ba2fcc9ef4d7d99a96..115062a45cc7e12a74eb368ff60ec2d276418ad4 100644 (file)
--- a/common/flash.c
+++ b/common/flash.c
@@ -41,7 +41,7 @@ flash_protect(int flag, ulong from, ulong to, flash_info_t *info)
 
        debug("%s %s: from 0x%08lX to 0x%08lX\n", __func__,
              (flag & FLAG_PROTECT_SET) ? "ON" :
-                     (flag & FLAG_PROTECT_CLEAR) ? "OFF" : "???",
+             (flag & FLAG_PROTECT_CLEAR) ? "OFF" : "???",
              from, to);
 
        /* There is nothing to do if we have no data about the flash
@@ -67,7 +67,7 @@ flash_protect(int flag, ulong from, ulong to, flash_info_t *info)
 #else
                                info->protect[i] = 0;
 #endif /* CONFIG_SYS_FLASH_PROTECTION */
-                               debug ("protect off %d\n", i);
+                               debug("protect off %d\n", i);
                        }
                        else if (flag & FLAG_PROTECT_SET) {
 #if defined(CONFIG_SYS_FLASH_PROTECTION)
@@ -75,7 +75,7 @@ flash_protect(int flag, ulong from, ulong to, flash_info_t *info)
 #else
                                info->protect[i] = 1;
 #endif /* CONFIG_SYS_FLASH_PROTECTION */
-                               debug ("protect on %d\n", i);
+                               debug("protect on %d\n", i);
                        }
                }
        }

diff --git a/drivers/rtc/m41t11.c b/drivers/rtc/m41t11.c
index 960348bb3eaa9471fdc30f6525ec71c9a8183c22..b09d08d65c52775c3c35a4f6a4e9c9fbcd6a6387 100644 (file)
--- a/drivers/rtc/m41t11.c
+++ b/drivers/rtc/m41t11.c
@@ -109,9 +109,9 @@ int rtc_get (struct rtc_time *tmp)
        tmp->tm_yday = 0;
        tmp->tm_isdst= 0;
 
-       debug ( "Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
-               tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
-               tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+       debug("Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
+             tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
+             tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
 
        return rel;
 }
@@ -120,9 +120,9 @@ int rtc_set (struct rtc_time *tmp)
 {
        uchar data[RTC_REG_CNT];
 
-       debug ( "Set DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
-               tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
-               tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+       debug("Set DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
+             tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
+             tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
 
        data[RTC_SEC_ADDR]    = bin2bcd(tmp->tm_sec) &  0x7F;/*just in case*/
        data[RTC_MIN_ADDR]    = bin2bcd(tmp->tm_min);