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 <asm/u-boot.h> #include <asm/u-boot.h> 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: <smpl> @@ typedef bd_t; @@ -bd_t +struct bd_info </smpl> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:

committed by
Tom Rini

parent
02ff91e8c6
commit
b75d8dc564
@@ -184,7 +184,7 @@ void watchdog_reset (void)
|
||||
* Initializes on-chip ethernet controllers.
|
||||
* to override, implement board_eth_init()
|
||||
*/
|
||||
int cpu_eth_init(bd_t *bis)
|
||||
int cpu_eth_init(struct bd_info *bis)
|
||||
{
|
||||
#if defined(CONFIG_UEC_ETH)
|
||||
uec_standard_init(bis);
|
||||
@@ -201,7 +201,7 @@ int cpu_eth_init(bd_t *bis)
|
||||
* Initializes on-chip MMC controllers.
|
||||
* to override, implement board_mmc_init()
|
||||
*/
|
||||
int cpu_mmc_init(bd_t *bis)
|
||||
int cpu_mmc_init(struct bd_info *bis)
|
||||
{
|
||||
#ifdef CONFIG_FSL_ESDHC
|
||||
return fsl_esdhc_mmc_init(bis);
|
||||
|
@@ -31,7 +31,7 @@ void fdt_fixup_muram (void *blob)
|
||||
}
|
||||
#endif
|
||||
|
||||
void ft_cpu_setup(void *blob, bd_t *bd)
|
||||
void ft_cpu_setup(void *blob, struct bd_info *bd)
|
||||
{
|
||||
immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
|
||||
int spridr = immr->sysconf.spridr;
|
||||
|
@@ -72,7 +72,7 @@ void timer_interrupt_cpu (struct pt_regs *regs)
|
||||
* irqinfo - print information about PCI devices
|
||||
*/
|
||||
|
||||
void do_irqinfo(struct cmd_tbl *cmdtp, bd_t *bd, int flag, int argc,
|
||||
void do_irqinfo(struct cmd_tbl *cmdtp, struct bd_info *bd, int flag, int argc,
|
||||
char *const argv[])
|
||||
{
|
||||
}
|
||||
|
@@ -185,7 +185,7 @@ void mpc83xx_pcislave_unlock(int bus)
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_OF_LIBFDT)
|
||||
void ft_pci_setup(void *blob, bd_t *bd)
|
||||
void ft_pci_setup(void *blob, struct bd_info *bd)
|
||||
{
|
||||
int nodeoffset;
|
||||
int tmp[2];
|
||||
|
@@ -377,7 +377,7 @@ watchdog_reset(void)
|
||||
* Initializes on-chip MMC controllers.
|
||||
* to override, implement board_mmc_init()
|
||||
*/
|
||||
int cpu_mmc_init(bd_t *bis)
|
||||
int cpu_mmc_init(struct bd_info *bis)
|
||||
{
|
||||
#ifdef CONFIG_FSL_ESDHC
|
||||
return fsl_esdhc_mmc_init(bis);
|
||||
|
@@ -206,7 +206,7 @@ static int fec_recv(struct eth_device* dev)
|
||||
}
|
||||
|
||||
|
||||
static int fec_init(struct eth_device* dev, bd_t *bis)
|
||||
static int fec_init(struct eth_device* dev, struct bd_info *bis)
|
||||
{
|
||||
struct ether_fcc_info_s * info = dev->priv;
|
||||
int i;
|
||||
@@ -418,7 +418,7 @@ static void fec_halt(struct eth_device* dev)
|
||||
}
|
||||
}
|
||||
|
||||
int fec_initialize(bd_t *bis)
|
||||
int fec_initialize(struct bd_info *bis)
|
||||
{
|
||||
struct eth_device* dev;
|
||||
int i;
|
||||
|
@@ -597,7 +597,7 @@ static void fdt_fixup_l2_switch(void *blob)
|
||||
#define fdt_fixup_l2_switch(x)
|
||||
#endif
|
||||
|
||||
void ft_cpu_setup(void *blob, bd_t *bd)
|
||||
void ft_cpu_setup(void *blob, struct bd_info *bd)
|
||||
{
|
||||
int off;
|
||||
int val;
|
||||
|
@@ -11,7 +11,7 @@
|
||||
extern void ft_fixup_num_cores(void *blob);
|
||||
extern void ft_srio_setup(void *blob);
|
||||
|
||||
void ft_cpu_setup(void *blob, bd_t *bd)
|
||||
void ft_cpu_setup(void *blob, struct bd_info *bd)
|
||||
{
|
||||
#ifdef CONFIG_MP
|
||||
int off;
|
||||
|
@@ -277,7 +277,7 @@ unsigned long get_tbclk(void)
|
||||
* Initializes on-chip ethernet controllers.
|
||||
* to override, implement board_eth_init()
|
||||
*/
|
||||
int cpu_eth_init(bd_t *bis)
|
||||
int cpu_eth_init(struct bd_info *bis)
|
||||
{
|
||||
#if defined(CONFIG_MPC8XX_FEC)
|
||||
fec_initialize(bis);
|
||||
|
@@ -12,7 +12,7 @@
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
void ft_cpu_setup(void *blob, bd_t *bd)
|
||||
void ft_cpu_setup(void *blob, struct bd_info *bd)
|
||||
{
|
||||
do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
|
||||
"timebase-frequency", get_tbclk(), 1);
|
||||
|
@@ -347,7 +347,7 @@ int fixup_cpu(void)
|
||||
* Initializes on-chip ethernet controllers.
|
||||
* to override, implement board_eth_init()
|
||||
*/
|
||||
int cpu_eth_init(bd_t *bis)
|
||||
int cpu_eth_init(struct bd_info *bis)
|
||||
{
|
||||
#if defined(CONFIG_ETHER_ON_FCC)
|
||||
fec_initialize(bis);
|
||||
|
@@ -18,7 +18,7 @@ void __weak board_detail(void)
|
||||
|
||||
void arch_print_bdinfo(void)
|
||||
{
|
||||
bd_t *bd = gd->bd;
|
||||
struct bd_info *bd = gd->bd;
|
||||
|
||||
#if defined(CONFIG_SYS_INIT_RAM_ADDR)
|
||||
bdinfo_print_num("sramstart", (ulong)bd->bi_sramstart);
|
||||
|
@@ -38,7 +38,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
static ulong get_sp (void);
|
||||
extern void ft_fixup_num_cores(void *blob);
|
||||
static void set_clocks_in_mhz (bd_t *kbd);
|
||||
static void set_clocks_in_mhz (struct bd_info *kbd);
|
||||
|
||||
#ifndef CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE
|
||||
#define CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE (768*1024*1024)
|
||||
@@ -46,13 +46,13 @@ static void set_clocks_in_mhz (bd_t *kbd);
|
||||
|
||||
static void boot_jump_linux(bootm_headers_t *images)
|
||||
{
|
||||
void (*kernel)(bd_t *, ulong r4, ulong r5, ulong r6,
|
||||
ulong r7, ulong r8, ulong r9);
|
||||
void (*kernel)(struct bd_info *, ulong r4, ulong r5, ulong r6,
|
||||
ulong r7, ulong r8, ulong r9);
|
||||
#ifdef CONFIG_OF_LIBFDT
|
||||
char *of_flat_tree = images->ft_addr;
|
||||
#endif
|
||||
|
||||
kernel = (void (*)(bd_t *, ulong, ulong, ulong,
|
||||
kernel = (void (*)(struct bd_info *, ulong, ulong, ulong,
|
||||
ulong, ulong, ulong))images->ep;
|
||||
debug("## Transferring control to Linux (at address %08lx) ...\n",
|
||||
(ulong)kernel);
|
||||
@@ -84,7 +84,7 @@ static void boot_jump_linux(bootm_headers_t *images)
|
||||
*/
|
||||
debug(" Booting using OF flat tree...\n");
|
||||
WATCHDOG_RESET ();
|
||||
(*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC,
|
||||
(*kernel) ((struct bd_info *)of_flat_tree, 0, 0, EPAPR_MAGIC,
|
||||
env_get_bootm_mapsize(), 0, 0);
|
||||
/* does not return */
|
||||
} else
|
||||
@@ -104,7 +104,7 @@ static void boot_jump_linux(bootm_headers_t *images)
|
||||
ulong cmd_end = images->cmdline_end;
|
||||
ulong initrd_start = images->initrd_start;
|
||||
ulong initrd_end = images->initrd_end;
|
||||
bd_t *kbd = images->kbd;
|
||||
struct bd_info *kbd = images->kbd;
|
||||
|
||||
debug(" Booting using board info...\n");
|
||||
WATCHDOG_RESET ();
|
||||
@@ -200,7 +200,7 @@ static int boot_bd_t_linux(bootm_headers_t *images)
|
||||
{
|
||||
ulong of_size = images->ft_len;
|
||||
struct lmb *lmb = &images->lmb;
|
||||
bd_t **kbd = &images->kbd;
|
||||
struct bd_info **kbd = &images->kbd;
|
||||
|
||||
int ret = 0;
|
||||
|
||||
@@ -270,7 +270,7 @@ static ulong get_sp (void)
|
||||
return sp;
|
||||
}
|
||||
|
||||
static void set_clocks_in_mhz (bd_t *kbd)
|
||||
static void set_clocks_in_mhz (struct bd_info *kbd)
|
||||
{
|
||||
char *s;
|
||||
|
||||
|
Reference in New Issue
Block a user