From b75d8dc5642b71eb029e7cd38031a32029e736cc Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 26 Jun 2020 15:13:33 +0900 Subject: treewide: convert bd_t to struct bd_info by coccinelle The Linux coding style guide (Documentation/process/coding-style.rst) clearly says: It's a **mistake** to use typedef for structures and pointers. Besides, using typedef for structures is annoying when you try to make headers self-contained. Let's say you have the following function declaration in a header: void foo(bd_t *bd); This is not self-contained since bd_t is not defined. To tell the compiler what 'bd_t' is, you need to include #include void foo(bd_t *bd); Then, the include direcective pulls in more bloat needlessly. If you use 'struct bd_info' instead, it is enough to put a forward declaration as follows: struct bd_info; void foo(struct bd_info *bd); Right, typedef'ing bd_t is a mistake. I used coccinelle to generate this commit. The semantic patch that makes this change is as follows: @@ typedef bd_t; @@ -bd_t +struct bd_info Signed-off-by: Masahiro Yamada --- common/board_f.c | 13 +++++++------ common/board_r.c | 4 ++-- common/bootm_os.c | 8 ++++---- common/image.c | 8 +++++--- common/spl/spl.c | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) (limited to 'common') diff --git a/common/board_f.c b/common/board_f.c index b610365..88ff042 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -502,11 +502,12 @@ static int reserve_malloc(void) static int reserve_board(void) { if (!gd->bd) { - gd->start_addr_sp = reserve_stack_aligned(sizeof(bd_t)); - gd->bd = (bd_t *)map_sysmem(gd->start_addr_sp, sizeof(bd_t)); - memset(gd->bd, '\0', sizeof(bd_t)); + gd->start_addr_sp = reserve_stack_aligned(sizeof(struct bd_info)); + gd->bd = (struct bd_info *)map_sysmem(gd->start_addr_sp, + sizeof(struct bd_info)); + memset(gd->bd, '\0', sizeof(struct bd_info)); debug("Reserving %zu Bytes for Board Info at: %08lx\n", - sizeof(bd_t), gd->start_addr_sp); + sizeof(struct bd_info), gd->start_addr_sp); } return 0; } @@ -601,7 +602,7 @@ static int display_new_sp(void) defined(CONFIG_SH) static int setup_board_part1(void) { - bd_t *bd = gd->bd; + struct bd_info *bd = gd->bd; /* * Save local variables to board info struct @@ -631,7 +632,7 @@ static int setup_board_part1(void) #if defined(CONFIG_PPC) || defined(CONFIG_M68K) static int setup_board_part2(void) { - bd_t *bd = gd->bd; + struct bd_info *bd = gd->bd; bd->bi_intfreq = gd->cpu_clk; /* Internal Freq, in Hz */ bd->bi_busfreq = gd->bus_clk; /* Bus Freq, in Hz */ diff --git a/common/board_r.c b/common/board_r.c index 5e92432..67dc25c 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -381,7 +381,7 @@ __weak int is_flash_available(void) static int initr_flash(void) { ulong flash_size = 0; - bd_t *bd = gd->bd; + struct bd_info *bd = gd->bd; if (!is_flash_available()) return 0; @@ -533,7 +533,7 @@ static int initr_api(void) #ifdef CONFIG_CMD_NET static int initr_ethaddr(void) { - bd_t *bd = gd->bd; + struct bd_info *bd = gd->bd; /* kept around for legacy kernels only ... ignore the next section */ eth_env_get_enetaddr("ethaddr", bd->bi_enetaddr); diff --git a/common/bootm_os.c b/common/bootm_os.c index a3c360e..6a95e0d 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -61,7 +61,7 @@ static void copy_args(char *dest, int argc, char *const argv[], char delim) static int do_bootm_netbsd(int flag, int argc, char *const argv[], bootm_headers_t *images) { - void (*loader)(bd_t *, image_header_t *, char *, char *); + void (*loader)(struct bd_info *, image_header_t *, char *, char *); image_header_t *os_hdr, *hdr; ulong kernel_data, kernel_len; char *cmdline; @@ -109,7 +109,7 @@ static int do_bootm_netbsd(int flag, int argc, char *const argv[], cmdline = ""; } - loader = (void (*)(bd_t *, image_header_t *, char *, char *))images->ep; + loader = (void (*)(struct bd_info *, image_header_t *, char *, char *))images->ep; printf("## Transferring control to NetBSD stage-2 loader (at address %08lx) ...\n", (ulong)loader); @@ -155,7 +155,7 @@ static int do_bootm_lynxkdi(int flag, int argc, char *const argv[], static int do_bootm_rtems(int flag, int argc, char *const argv[], bootm_headers_t *images) { - void (*entry_point)(bd_t *); + void (*entry_point)(struct bd_info *); if (flag != BOOTM_STATE_OS_GO) return 0; @@ -167,7 +167,7 @@ static int do_bootm_rtems(int flag, int argc, char *const argv[], } #endif - entry_point = (void (*)(bd_t *))images->ep; + entry_point = (void (*)(struct bd_info *))images->ep; printf("## Transferring control to RTEMS (at address %08lx) ...\n", (ulong)entry_point); diff --git a/common/image.c b/common/image.c index ff16f5a..9d7d5c1 100644 --- a/common/image.c +++ b/common/image.c @@ -1665,10 +1665,12 @@ int boot_get_cmdline(struct lmb *lmb, ulong *cmd_start, ulong *cmd_end) * 0 - success * -1 - failure */ -int boot_get_kbd(struct lmb *lmb, bd_t **kbd) +int boot_get_kbd(struct lmb *lmb, struct bd_info **kbd) { - *kbd = (bd_t *)(ulong)lmb_alloc_base(lmb, sizeof(bd_t), 0xf, - env_get_bootm_mapsize() + env_get_bootm_low()); + *kbd = (struct bd_info *)(ulong)lmb_alloc_base(lmb, + sizeof(struct bd_info), + 0xf, + env_get_bootm_mapsize() + env_get_bootm_low()); if (*kbd == NULL) return -1; diff --git a/common/spl/spl.c b/common/spl/spl.c index 0e96a8c..4840d1d 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -54,7 +54,7 @@ binman_sym_declare(ulong, spl, size); #endif /* Define board data structure */ -static bd_t bdata __attribute__ ((section(".data"))); +static struct bd_info bdata __attribute__ ((section(".data"))); /* * Board-specific Platform code can reimplement show_boot_progress () if needed -- cgit v1.1