mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 07:04:28 +00:00
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>
This commit is contained in:
Simon Glass
Tom Rini
parent
0914011310
commit
3c7dded8e1
7 changed files with 30 additions and 31 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ int dram_init(void)
|
|||
dram_size = fixed_sdram ();
|
||||
#endif
|
||||
|
||||
debug (" DDR: ");
|
||||
debug(" DDR: ");
|
||||
gd->ram_size = dram_size;
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
19
cmd/flash.c
19
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)
|
||||
|
|
|
|||
10
cmd/source.c
10
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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue