From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 01/11] MIPS: board.c: make checkpatch.pl clean
Date: Fri, 25 Nov 2011 09:38:52 +0100 [thread overview]
Message-ID: <201111250938.52864.marek.vasut@gmail.com> (raw)
In-Reply-To: <1322143076-20349-2-git-send-email-daniel.schwierzeck@googlemail.com>
> WARNING: line over 80 characters
> WARNING: space prohibited between function name and open parenthesis '('
> WARNING: braces {} are not necessary for single statement blocks
> ERROR: return is not a function, parentheses are not required
> ERROR: do not use assignment in if condition
> ERROR: trailing statements should be on next line
> ERROR: "foo * bar" should be "foo *bar"
> ERROR: spaces required around that ':' (ctx:WxV)
>
> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
> ---
> arch/mips/lib/board.c | 119
> +++++++++++++++++++++++++------------------------ 1 files changed, 61
> insertions(+), 58 deletions(-)
>
> diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
> index 1274d63..9585db7 100644
> --- a/arch/mips/lib/board.c
> +++ b/arch/mips/lib/board.c
> @@ -64,42 +64,43 @@ int __board_early_init_f(void)
> */
> return 0;
> }
> -int board_early_init_f(void) __attribute__((weak,
> alias("__board_early_init_f"))); +int board_early_init_f(void)
> + __attribute__((weak, alias("__board_early_init_f")));
>
>
> -static int init_func_ram (void)
> +static int init_func_ram(void)
> {
> #ifdef CONFIG_BOARD_TYPES
> int board_type = gd->board_type;
> #else
> int board_type = 0; /* use dummy arg */
> #endif
> - puts ("DRAM: ");
> + puts("DRAM: ");
>
> - if ((gd->ram_size = initdram (board_type)) > 0) {
> - print_size (gd->ram_size, "\n");
> - return (0);
> + gd->ram_size = initdram(board_type);
> + if (gd->ram_size) {
> + print_size(gd->ram_size, "\n");
> + return 0;
> }
> - puts (failed);
> - return (1);
> + puts(failed);
> + return 1;
> }
>
> static int display_banner(void)
> {
> -
> - printf ("\n\n%s\n\n", version_string);
> - return (0);
> + printf("\n\n%s\n\n", version_string);
> + return 0;
> }
>
> #ifndef CONFIG_SYS_NO_FLASH
> static void display_flash_config(ulong size)
> {
> - puts ("Flash: ");
> - print_size (size, "\n");
> + puts("Flash: ");
> + print_size(size, "\n");
> }
> #endif
>
> -static int init_baudrate (void)
> +static int init_baudrate(void)
> {
> gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE);
> return 0;
> @@ -133,7 +134,8 @@ init_fnc_t *init_sequence[] = {
> timer_init,
> env_init, /* initialize environment */
> #ifdef CONFIG_INCA_IP
> - incaip_set_cpuclk, /* set cpu clock according to environment
variable */
> + /* set cpu clock according to environment variable */
> + incaip_set_cpuclk,
> #endif
> init_baudrate, /* initialze baudrate settings */
> serial_init, /* serial communications setup */
> @@ -153,18 +155,19 @@ void board_init_f(ulong bootflag)
> ulong addr, addr_sp, len = (ulong)&uboot_end - CONFIG_SYS_MONITOR_BASE;
> ulong *s;
>
> - /* Pointer is writable since we allocated a register for it.
You can use single-line comment here /* comment */ ?
> + /*
> + * Pointer is writable since we allocated a register for it.
> */
> gd = &gd_data;
> +
> /* compiler optimization barrier needed for GCC >= 3.4 */
> - __asm__ __volatile__("": : :"memory");
> + __asm__ __volatile__("" : : : "memory");
>
> - memset ((void *)gd, 0, sizeof (gd_t));
> + memset((void *)gd, 0, sizeof(gd_t));
>
> for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
> - if ((*init_fnc_ptr)() != 0) {
> - hang ();
> - }
> + if ((*init_fnc_ptr)() != 0)
> + hang();
> }
>
> /*
> @@ -179,7 +182,7 @@ void board_init_f(ulong bootflag)
> /* round down to next 4 kB limit.
> */
> addr &= ~(4096 - 1);
> - debug ("Top of RAM usable for U-Boot at: %08lx\n", addr);
> + debug("Top of RAM usable for U-Boot at: %08lx\n", addr);
>
> /* Reserve memory for U-Boot code, data & bss
> * round down to next 16 kB limit
> @@ -187,12 +190,12 @@ void board_init_f(ulong bootflag)
> addr -= len;
> addr &= ~(16 * 1024 - 1);
>
> - debug ("Reserving %ldk for U-Boot at: %08lx\n", len >> 10, addr);
> + debug("Reserving %ldk for U-Boot at: %08lx\n", len >> 10, addr);
>
> /* Reserve memory for malloc() arena.
> */
> addr_sp = addr - TOTAL_MALLOC_LEN;
> - debug ("Reserving %dk for malloc() at: %08lx\n",
> + debug("Reserving %dk for malloc() at: %08lx\n",
> TOTAL_MALLOC_LEN >> 10, addr_sp);
>
> /*
> @@ -202,19 +205,19 @@ void board_init_f(ulong bootflag)
> addr_sp -= sizeof(bd_t);
> bd = (bd_t *)addr_sp;
> gd->bd = bd;
> - debug ("Reserving %zu Bytes for Board Info at: %08lx\n",
> + debug("Reserving %zu Bytes for Board Info at: %08lx\n",
> sizeof(bd_t), addr_sp);
>
> addr_sp -= sizeof(gd_t);
> id = (gd_t *)addr_sp;
> - debug ("Reserving %zu Bytes for Global Data at: %08lx\n",
> - sizeof (gd_t), addr_sp);
> + debug("Reserving %zu Bytes for Global Data at: %08lx\n",
> + sizeof(gd_t), addr_sp);
>
> /* Reserve memory for boot params.
> */
> addr_sp -= CONFIG_SYS_BOOTPARAMS_LEN;
> bd->bi_boot_params = addr_sp;
> - debug ("Reserving %dk for boot params() at: %08lx\n",
> + debug("Reserving %dk for boot params() at: %08lx\n",
> CONFIG_SYS_BOOTPARAMS_LEN >> 10, addr_sp);
>
> /*
> @@ -229,18 +232,18 @@ void board_init_f(ulong bootflag)
> *s-- = 0;
> *s-- = 0;
> addr_sp = (ulong)s;
> - debug ("Stack Pointer at: %08lx\n", addr_sp);
> + debug("Stack Pointer at: %08lx\n", addr_sp);
>
> /*
> * Save local variables to board info struct
> */
> - bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; /* start of DRAM memory
*/
> - bd->bi_memsize = gd->ram_size; /* size of DRAM memory in
bytes */
> - bd->bi_baudrate = gd->baudrate; /* Console Baudrate */
> + bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; /* start of DRAM memory */
> + bd->bi_memsize = gd->ram_size; /* size of DRAM memory in bytes */
> + bd->bi_baudrate = gd->baudrate; /* Console Baudrate */
>
> - memcpy (id, (void *)gd, sizeof (gd_t));
> + memcpy(id, (void *)gd, sizeof(gd_t));
>
> - relocate_code (addr_sp, id, addr);
> + relocate_code(addr_sp, id, addr);
>
> /* NOTREACHED - relocate_code() does not return */
> }
> @@ -254,14 +257,14 @@ void board_init_f(ulong bootflag)
> ************************************************************************
> */
>
> -void board_init_r (gd_t *id, ulong dest_addr)
> +void board_init_r(gd_t *id, ulong dest_addr)
> {
> #ifndef CONFIG_SYS_NO_FLASH
> ulong size;
> #endif
> - extern void malloc_bin_reloc (void);
> + extern void malloc_bin_reloc(void);
> #ifndef CONFIG_ENV_IS_NOWHERE
> - extern char * env_name_spec;
> + extern char *env_name_spec;
> #endif
> char *s;
> bd_t *bd;
> @@ -269,7 +272,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
> gd = id;
> gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
>
> - debug ("Now running in RAM - U-Boot at: %08lx\n", dest_addr);
> + debug("Now running in RAM - U-Boot at: %08lx\n", dest_addr);
>
> gd->reloc_off = dest_addr - CONFIG_SYS_MONITOR_BASE;
>
> @@ -298,7 +301,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
> #ifndef CONFIG_SYS_NO_FLASH
> /* configure available FLASH banks */
> size = flash_init();
> - display_flash_config (size);
> + display_flash_config(size);
> bd->bi_flashsize = size;
> #endif
>
> @@ -310,8 +313,8 @@ void board_init_r (gd_t *id, ulong dest_addr)
> #endif
>
> #ifdef CONFIG_CMD_NAND
> - puts ("NAND: ");
> - nand_init (); /* go init the NAND */
> + puts("NAND: ");
> + nand_init(); /* go init the NAND */
> #endif
>
> #if defined(CONFIG_CMD_ONENAND)
> @@ -333,51 +336,51 @@ void board_init_r (gd_t *id, ulong dest_addr)
>
> /** leave this here (after malloc(), environment and PCI are working) **/
> /* Initialize stdio devices */
> - stdio_init ();
> + stdio_init();
>
> - jumptable_init ();
> + jumptable_init();
>
> /* Initialize the console (after the relocation and devices init) */
> - console_init_r ();
> + console_init_r();
> /** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
>
> /* Initialize from environment */
> load_addr = getenv_ulong("loadaddr", 16, load_addr);
> #if defined(CONFIG_CMD_NET)
> - if ((s = getenv ("bootfile")) != NULL) {
> - copy_filename (BootFile, s, sizeof (BootFile));
> - }
> + s = getenv("bootfile");
> + if (s)
> + copy_filename(BootFile, s, sizeof(BootFile));
> #endif
>
> #ifdef CONFIG_CMD_SPI
> - puts ("SPI: ");
> - spi_init (); /* go init the SPI */
> - puts ("ready\n");
> + puts("SPI: ");
> + spi_init(); /* go init the SPI */
> + puts("ready\n");
> #endif
>
> #if defined(CONFIG_MISC_INIT_R)
> /* miscellaneous platform dependent initialisations */
> - misc_init_r ();
> + misc_init_r();
> #endif
>
> #ifdef CONFIG_BITBANGMII
> bb_miiphy_init();
> #endif
> #if defined(CONFIG_CMD_NET)
> - puts ("Net: ");
> + puts("Net: ");
> eth_initialize(gd->bd);
> #endif
>
> /* main_loop() can return to retry autoboot, if so just run it again. */
> - for (;;) {
> - main_loop ();
> - }
> + for (;;)
> + main_loop();
>
> /* NOTREACHED - no way out of command loop except booting */
> }
>
> -void hang (void)
> +void hang(void)
> {
> - puts ("### ERROR ### Please RESET the board ###\n");
> - for (;;);
> + puts("### ERROR ### Please RESET the board ###\n");
> + for (;;)
> + ;
> }
Other than the minor comment thing,
Acked-by: Marek Vasut <marek.vasut@gmail.com>
next prev parent reply other threads:[~2011-11-25 8:38 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-24 13:57 [U-Boot] [PATCH 00/11] MIPS: fixes and updates Daniel Schwierzeck
2011-11-24 13:57 ` [U-Boot] [PATCH 01/11] MIPS: board.c: make checkpatch.pl clean Daniel Schwierzeck
2011-11-25 8:38 ` Marek Vasut [this message]
2011-11-30 12:39 ` [U-Boot] [PATCH v2 " Daniel Schwierzeck
2011-12-09 9:52 ` [U-Boot] [PATCH " Wolfgang Denk
2011-11-24 13:57 ` [U-Boot] [PATCH 02/11] MIPS: board.c: fix warning if CONFIG_CMD_NET is not defined Daniel Schwierzeck
2011-11-25 8:39 ` Marek Vasut
2011-11-25 12:37 ` Daniel Schwierzeck
2011-11-25 13:41 ` Marek Vasut
2011-12-09 9:50 ` Wolfgang Denk
2011-12-09 12:34 ` Daniel Schwierzeck
2011-11-24 13:57 ` [U-Boot] [PATCH 03/11] MIPS: board.c: fix init of flash data in bd_info Daniel Schwierzeck
2011-11-25 8:40 ` Marek Vasut
2011-11-24 13:57 ` [U-Boot] [PATCH 04/11] MIPS: add register definition for EBase register Daniel Schwierzeck
2011-11-25 8:43 ` Marek Vasut
2011-11-25 12:10 ` Daniel Schwierzeck
2011-11-24 13:57 ` [U-Boot] [PATCH 05/11] MIPS: add sleep handler for slave CPUs in multi-processor systems Daniel Schwierzeck
2011-11-25 8:44 ` Marek Vasut
2011-11-25 12:19 ` Daniel Schwierzeck
2011-11-25 13:40 ` Marek Vasut
2011-11-25 15:35 ` Andrew Dyer
2011-11-28 16:24 ` Shinya Kuribayashi
2011-11-29 15:54 ` Daniel Schwierzeck
2011-11-24 13:57 ` [U-Boot] [PATCH 06/11] MIPS: make cache operation mode configurable in dcache_enable() Daniel Schwierzeck
2011-11-25 8:45 ` Marek Vasut
2011-11-24 13:57 ` [U-Boot] [PATCH 07/11] MIPS: extend cache initialization for MIPS24K and MIPS34K cores Daniel Schwierzeck
2011-11-25 8:46 ` Marek Vasut
2011-11-30 12:39 ` [U-Boot] [PATCH v2 07/10] MIPS: extend cache initialization for recent MIPS CPU cores Daniel Schwierzeck
2011-11-24 13:57 ` [U-Boot] [PATCH 08/11] MIPS: add additional reserved vectors for MIPS24K and MIPS34K cores Daniel Schwierzeck
2011-11-25 8:47 ` Marek Vasut
2011-11-28 16:48 ` Shinya Kuribayashi
2011-11-29 15:44 ` Daniel Schwierzeck
2011-11-30 12:39 ` [U-Boot] [PATCH v2 08/10] MIPS: start.S: refactor reset and exception vector setup Daniel Schwierzeck
2011-11-24 13:57 ` [U-Boot] [PATCH 09/11] MIPS: add header file for generic GPIO API Daniel Schwierzeck
2011-11-25 8:48 ` Marek Vasut
2011-11-24 13:57 ` [U-Boot] [PATCH 10/11] MIPS: add init hook for CPU specific initialization Daniel Schwierzeck
2011-11-25 8:49 ` Marek Vasut
2012-03-31 20:53 ` Marek Vasut
2011-11-24 13:57 ` [U-Boot] [PATCH 11/11] MIPS: MAKEALL: fix lists for MIPSel and MIPS boards Daniel Schwierzeck
2011-11-24 17:41 ` Mike Frysinger
2011-11-25 8:49 ` Marek Vasut
2011-11-25 12:29 ` Daniel Schwierzeck
2011-11-25 15:21 ` thomas.langer at lantiq.com
2011-11-25 19:52 ` Mike Frysinger
2011-12-09 9:53 ` Wolfgang Denk
2012-03-31 20:49 ` [U-Boot] [PATCH 00/11] MIPS: fixes and updates Marek Vasut
2012-04-02 11:54 ` Daniel Schwierzeck
2012-04-02 12:01 ` Anatolij Gustschin
2012-04-02 12:20 ` Daniel Schwierzeck
2012-04-02 13:35 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201111250938.52864.marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.