From a3d0bf966cb932bdf1b2a4f189f21410a9036b16 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 20 Sep 2016 10:08:54 +0200 Subject: board/toradex/common: whitespace fixup Cleanup whitespace found when preparing patches for mainline. Signed-off-by: Max Krummenacher Signed-off-by: Marcel Ziswiler --- board/toradex/common/common.c | 9 +++------ board/toradex/common/configblock.c | 10 +++++----- board/toradex/common/configblock.h | 6 +++--- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/board/toradex/common/common.c b/board/toradex/common/common.c index 642e723ed9..6f19552ac9 100644 --- a/board/toradex/common/common.c +++ b/board/toradex/common/common.c @@ -67,7 +67,6 @@ void get_board_serial(struct tag_serialnr *serialnr) } #endif /* CONFIG_SERIAL_TAG */ - int checkboard(void) { unsigned char ethaddr[6]; @@ -85,7 +84,6 @@ int checkboard(void) trdx_hw_tag.ver_minor, (char)trdx_hw_tag.ver_assembly + 'A'); - setenv("serial#", trdx_serial_str); /* @@ -108,9 +106,9 @@ int checkboard(void) #endif printf("Model: Toradex %s %s, Serial# %s\n", - toradex_modules[trdx_hw_tag.prodid], - trdx_board_rev_str, - trdx_serial_str); + toradex_modules[trdx_hw_tag.prodid], + trdx_board_rev_str, + trdx_serial_str); return 0; } @@ -165,7 +163,6 @@ u32 get_board_serial(void) } #endif /* CONFIG_SERIAL_TAG */ - int checkboard(void) { checkboard_fallback(); diff --git a/board/toradex/common/configblock.c b/board/toradex/common/configblock.c index 03ecaab1d8..a33a3451eb 100644 --- a/board/toradex/common/configblock.c +++ b/board/toradex/common/configblock.c @@ -34,9 +34,9 @@ DECLARE_GLOBAL_DATA_PTR; #endif struct toradex_tag { - u32 len : 14; - u32 flags : 2; - u32 id : 16; + u32 len:14; + u32 flags:2; + u32 id:16; }; bool valid_cfgblock; @@ -44,7 +44,7 @@ struct toradex_hw trdx_hw_tag; struct toradex_eth_addr trdx_eth_addr; u32 trdx_serial; -const char* const toradex_modules[] = { +const char * const toradex_modules[] = { [0] = "UNKNOWN MODULE", [1] = "Colibri PXA270 312MHz", [2] = "Colibri PXA270 520MHz", @@ -431,7 +431,7 @@ static int do_cfgblock_create(cmd_tbl_t *cmdtp, int flag, int argc, offset += 4; memcpy(config_block + offset, &trdx_eth_addr, 6); - offset +=6; + offset += 6; memset(config_block + offset, 0, 32 - offset); #ifdef CONFIG_TRDX_CFG_BLOCK_IS_IN_MMC diff --git a/board/toradex/common/configblock.h b/board/toradex/common/configblock.h index 4f1a3bf898..33cf1388b0 100644 --- a/board/toradex/common/configblock.h +++ b/board/toradex/common/configblock.h @@ -17,8 +17,8 @@ struct toradex_hw { }; struct toradex_eth_addr { - u32 oui : 24; - u32 nic : 24; + u32 oui:24; + u32 nic:24; } __attribute__((__packed__)); enum { @@ -54,7 +54,7 @@ enum { APALIS_TK1_2GB, }; -extern const char* const toradex_modules[]; +extern const char * const toradex_modules[]; extern bool valid_cfgblock; extern struct toradex_hw trdx_hw_tag; extern struct toradex_eth_addr trdx_eth_addr; -- cgit v1.2.3