From bb5a2cf9f99731915359b67b52eba307db86fff9 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <masahiroy@kernel.org>
Date: Fri, 26 Jun 2020 15:13:34 +0900
Subject: [PATCH] treewide: convert bd_t to struct bd_info manually
Some code was not converted by coccinelle, somehow.
I manually fixed up the remaining, and comments, README docs.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
[trini: Add arch/arm/mach-davinci/include/mach/sdmmc_defs.h and
include/fdt_support.h]
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-davinci/include/mach/sdmmc_defs.h | 2 +-
arch/m68k/cpu/mcf523x/cpu.c | 2 +-
arch/m68k/cpu/mcf52x2/cpu.c | 2 +-
arch/m68k/cpu/mcf532x/cpu.c | 2 +-
arch/m68k/cpu/mcf5445x/cpu.c | 2 +-
arch/m68k/cpu/mcf547x_8x/cpu.c | 2 +-
cmd/bootm.c | 2 +-
doc/README.POST | 6 +++---
doc/README.arm-relocation | 4 ++--
doc/README.atmel_mci | 2 +-
doc/README.console | 2 +-
doc/README.generic-board | 2 +-
doc/driver-model/ethernet.rst | 2 +-
drivers/net/fec_mxc.c | 4 ++--
drivers/net/ldpaa_eth/ldpaa_eth.c | 2 +-
drivers/net/smc911x.c | 2 +-
include/fdt_support.h | 4 ++--
17 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
index f95a607e52..d4195cf588 100644
--- a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
+++ b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h
@@ -159,6 +159,6 @@ struct davinci_mmc_plat {
struct mmc mmc;
};
-int davinci_mmc_init(bd_t *bis, struct davinci_mmc *host);
+int davinci_mmc_init(struct bd_info *bis, struct davinci_mmc *host);
#endif /* _SDMMC_DEFS_H */
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index a3a79fb4d2..8664231b5a 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -105,7 +105,7 @@ int watchdog_init(void)
#if defined(CONFIG_MCFFEC)
/* Default initializations for MCFFEC controllers. To override,
* create a board-specific function called:
- * int board_eth_init(bd_t *bis)
+ * int board_eth_init(struct bd_info *bis)
*/
int cpu_eth_init(struct bd_info *bis)
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index 1ca28e46ce..8898a7562a 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -420,7 +420,7 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
#if defined(CONFIG_MCFFEC)
/* Default initializations for MCFFEC controllers. To override,
* create a board-specific function called:
- * int board_eth_init(bd_t *bis)
+ * int board_eth_init(struct bd_info *bis)
*/
int cpu_eth_init(struct bd_info *bis)
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index 805108f7ac..f1e6f734eb 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -147,7 +147,7 @@ int watchdog_init(void)
#if defined(CONFIG_MCFFEC)
/* Default initializations for MCFFEC controllers. To override,
* create a board-specific function called:
- * int board_eth_init(bd_t *bis)
+ * int board_eth_init(struct bd_info *bis)
*/
int cpu_eth_init(struct bd_info *bis)
{
diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
index f5c1947b22..ebe15ca518 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -109,7 +109,7 @@ int print_cpuinfo(void)
#if defined(CONFIG_MCFFEC)
/* Default initializations for MCFFEC controllers. To override,
* create a board-specific function called:
- * int board_eth_init(bd_t *bis)
+ * int board_eth_init(struct bd_info *bis)
*/
int cpu_eth_init(struct bd_info *bis)
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index 76d2e77fc0..e53adeb46b 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
@@ -136,7 +136,7 @@ int watchdog_init(void)
#if defined(CONFIG_FSLDMAFEC) || defined(CONFIG_MCFFEC)
/* Default initializations for MCFFEC controllers. To override,
* create a board-specific function called:
- * int board_eth_init(bd_t *bis)
+ * int board_eth_init(struct bd_info *bis)
*/
int cpu_eth_init(struct bd_info *bis)
diff --git a/cmd/bootm.c b/cmd/bootm.c
index d5f877cb54..e6b0e04413 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -185,7 +185,7 @@ static char bootm_help_text[] =
"\tfdt - relocate flat device tree\n"
#endif
"\tcmdline - OS specific command line processing/setup\n"
- "\tbdt - OS specific bd_t processing\n"
+ "\tbdt - OS specific bd_info processing\n"
"\tprep - OS specific prep before relocation or go\n"
#if defined(CONFIG_TRACE)
"\tfake - OS specific fake start without go\n"
diff --git a/doc/README.POST b/doc/README.POST
index 43f424f60f..1d1c25bdf9 100644
--- a/doc/README.POST
+++ b/doc/README.POST
@@ -126,7 +126,7 @@ The following flags will be defined:
The POST layer will export the following interface routines:
- o) int post_run(bd_t *bd, char *name, int flags);
+ o) int post_run(struct bd_info *bd, char *name, int flags);
This routine will run the test (or the group of tests) specified
by the name and flag arguments. More specifically, if the name
@@ -175,7 +175,7 @@ struct post_test {
char *cmd;
char *desc;
int flags;
- int (*test)(bd_t *bd, int flags);
+ int (*test)(struct bd_info *bd, int flags);
};
o) name
@@ -364,7 +364,7 @@ declaration/body:
...
...
-int watchdog_post_test(bd_t *bd, int flags)
+int watchdog_post_test(struct bd_info *bd, int flags)
{
unsigned long start_time;
diff --git a/doc/README.arm-relocation b/doc/README.arm-relocation
index d2a7e8122e..bc6644911b 100644
--- a/doc/README.arm-relocation
+++ b/doc/README.arm-relocation
@@ -27,7 +27,7 @@ At board level:
TODO: move also dram initialization there on boards where it is possible.
- Setup of the the bd_t dram bank info is done in the new function
+ Setup of the bd_info dram bank info is done in the new function
dram_init_banksize() called after bd is accessible.
At lib level:
@@ -65,7 +65,7 @@ in f) could be saved.
TODO
-- fill in bd_t infos (check)
+- fill in struct bd_info infos (check)
- adapt all boards
- maybe adapt CONFIG_SYS_TEXT_BASE (this must be checked from board maintainers)
diff --git a/doc/README.atmel_mci b/doc/README.atmel_mci
index 6c027b089f..00e64ba0c7 100644
--- a/doc/README.atmel_mci
+++ b/doc/README.atmel_mci
@@ -47,7 +47,7 @@ the board specific file need added:
...
#ifdef CONFIG_GENERIC_ATMEL_MCI
/* this is a weak define that we are overriding */
-int board_mmc_init(bd_t *bd)
+int board_mmc_init(struct bd_info *bd)
{
/* Enable clock */
at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_MCI);
diff --git a/doc/README.console b/doc/README.console
index 02428fb396..9f5812c89d 100644
--- a/doc/README.console
+++ b/doc/README.console
@@ -62,7 +62,7 @@ U-Boot relocation (done in 'board_init_r' in arch/*/lib/board.c).
HOW CAN I USE STANDARD FILE INTO APPLICATIONS?
----------------------------------------------
-Use the 'bd_mon_fnc' field of the bd_t structure passed to the
+Use the 'bd_mon_fnc' field of the bd_info structure passed to the
application to do everything you want with the console.
But REMEMBER that that will work only if you have not overwritten any
diff --git a/doc/README.generic-board b/doc/README.generic-board
index 32ddb1d19a..bc35179fbf 100644
--- a/doc/README.generic-board
+++ b/doc/README.generic-board
@@ -22,7 +22,7 @@ The main change is that the arch/<arch>/lib/board.c file is removed in
favour of common/board_f.c (for pre-relocation init) and common/board_r.c
(for post-relocation init).
-Related to this, the global_data and bd_t structures now have a core set of
+Related to this, the global_data and bd_info structures now have a core set of
fields which are common to all architectures. Architecture-specific fields
have been moved to separate structures.
diff --git a/doc/driver-model/ethernet.rst b/doc/driver-model/ethernet.rst
index 359a0523cf..1f5310daaa 100644
--- a/doc/driver-model/ethernet.rst
+++ b/doc/driver-model/ethernet.rst
@@ -250,7 +250,7 @@ register function. The pseudo code would look something like:
.. code-block:: c
- int ape_register(bd_t *bis, int iobase)
+ int ape_register(struct bd_info *bis, int iobase)
{
struct ape_priv *priv;
struct eth_device *dev;
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 469c7b7cef..b3d4acb106 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -588,7 +588,7 @@ static int fec_open(struct eth_device *edev)
#ifdef CONFIG_DM_ETH
static int fecmxc_init(struct udevice *dev)
#else
-static int fec_init(struct eth_device *dev, bd_t *bd)
+static int fec_init(struct eth_device *dev, struct bd_info *bd)
#endif
{
#ifdef CONFIG_DM_ETH
@@ -1105,7 +1105,7 @@ struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id)
int fec_probe(struct bd_info *bd, int dev_id, uint32_t base_addr,
struct mii_dev *bus, struct phy_device *phydev)
#else
-static int fec_probe(bd_t *bd, int dev_id, uint32_t base_addr,
+static int fec_probe(struct bd_info *bd, int dev_id, uint32_t base_addr,
struct mii_dev *bus, int phy_id)
#endif
{
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 116b307b67..67da549fdb 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -514,7 +514,7 @@ static int ldpaa_eth_open(struct udevice *dev)
struct eth_pdata *plat = dev_get_platdata(dev);
struct ldpaa_eth_priv *priv = dev_get_priv(dev);
#else
-static int ldpaa_eth_open(struct eth_device *net_dev, bd_t *bd)
+static int ldpaa_eth_open(struct eth_device *net_dev, struct bd_info *bd)
{
struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)net_dev->priv;
#endif
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 053ff9f4ff..9c5dc46483 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -455,7 +455,7 @@ static int smc911x_initialize_mii(struct smc911x_priv *priv)
}
#endif
-static int smc911x_init(struct eth_device *dev, bd_t *bd)
+static int smc911x_init(struct eth_device *dev, struct bd_info *bd)
{
struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev);
diff --git a/include/fdt_support.h b/include/fdt_support.h
index b1543b534f..9684cffe80 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -180,7 +180,7 @@ int fdt_find_or_add_subnode(void *fdt, int parentoffset, const char *name);
* This function is called if CONFIG_OF_BOARD_SETUP is defined
*
* @param blob FDT blob to update
- * @param bd_t Pointer to board data
+ * @param bd Pointer to board data
* @return 0 if ok, or -FDT_ERR_... on error
*/
int ft_board_setup(void *blob, struct bd_info *bd);
@@ -202,7 +202,7 @@ void ft_pci_setup(void *blob, struct bd_info *bd);
* This function is called if CONFIG_OF_SYSTEM_SETUP is defined
*
* @param blob FDT blob to update
- * @param bd_t Pointer to board data
+ * @param bd Pointer to board data
* @return 0 if ok, or -FDT_ERR_... on error
*/
int ft_system_setup(void *blob, struct bd_info *bd);
--
2.39.5