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 --- arch/arm/lib/bdinfo.c | 2 +- arch/arm/lib/bootm-fdt.c | 2 +- arch/arm/lib/bootm.c | 11 ++++++----- arch/arm/lib/cache-cp15.c | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) (limited to 'arch/arm/lib') diff --git a/arch/arm/lib/bdinfo.c b/arch/arm/lib/bdinfo.c index 81c9291584..25bc6e80f4 100644 --- a/arch/arm/lib/bdinfo.c +++ b/arch/arm/lib/bdinfo.c @@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR; void arch_print_bdinfo(void) { - bd_t *bd = gd->bd; + struct bd_info *bd = gd->bd; bdinfo_print_num("arch_number", bd->bi_arch_number); #ifdef CONFIG_SYS_MEM_RESERVE_SECURE diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index 04f566d2b0..02a49a8e10 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -35,7 +35,7 @@ int arch_fixup_fdt(void *blob) { __maybe_unused int ret = 0; #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_OF_LIBFDT) - bd_t *bd = gd->bd; + struct bd_info *bd = gd->bd; int bank; u64 start[CONFIG_NR_DRAM_BANKS]; u64 size[CONFIG_NR_DRAM_BANKS]; diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 2df98d3e01..1206e306db 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -124,7 +124,7 @@ static void announce_and_cleanup(int fake) cleanup_before_linux(); } -static void setup_start_tag (bd_t *bd) +static void setup_start_tag (struct bd_info *bd) { params = (struct tag *)bd->bi_boot_params; @@ -138,7 +138,7 @@ static void setup_start_tag (bd_t *bd) params = tag_next (params); } -static void setup_memory_tags(bd_t *bd) +static void setup_memory_tags(struct bd_info *bd) { int i; @@ -153,7 +153,7 @@ static void setup_memory_tags(bd_t *bd) } } -static void setup_commandline_tag(bd_t *bd, char *commandline) +static void setup_commandline_tag(struct bd_info *bd, char *commandline) { char *p; @@ -178,7 +178,8 @@ static void setup_commandline_tag(bd_t *bd, char *commandline) params = tag_next (params); } -static void setup_initrd_tag(bd_t *bd, ulong initrd_start, ulong initrd_end) +static void setup_initrd_tag(struct bd_info *bd, ulong initrd_start, + ulong initrd_end) { /* an ATAG_INITRD node tells the kernel where the compressed * ramdisk can be found. ATAG_RDIMG is a better name, actually. @@ -217,7 +218,7 @@ static void setup_revision_tag(struct tag **in_params) params = tag_next (params); } -static void setup_end_tag(bd_t *bd) +static void setup_end_tag(struct bd_info *bd) { params->hdr.tag = ATAG_NONE; params->hdr.size = 0; diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c index 39717610d4..abd81d21c7 100644 --- a/arch/arm/lib/cache-cp15.c +++ b/arch/arm/lib/cache-cp15.c @@ -104,7 +104,7 @@ void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size, __weak void dram_bank_mmu_setup(int bank) { - bd_t *bd = gd->bd; + struct bd_info *bd = gd->bd; int i; /* bd->bi_dram is available only after relocation */ -- cgit v1.2.1