diff options
author | Masahiro Yamada | 2020-06-26 15:13:33 +0900 |
---|---|---|
committer | Tom Rini | 2020-07-17 09:30:13 -0400 |
commit | b75d8dc5642b71eb029e7cd38031a32029e736cc (patch) | |
tree | e13a2c309a27c528a79f7c49b468c0c2d246a499 /drivers | |
parent | 02ff91e8c60f1f48bee8f4bd1c87ea0892cc5dae (diff) |
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>
Diffstat (limited to 'drivers')
71 files changed, 131 insertions, 127 deletions
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c index a0f25d1179e..d6e7a175d0d 100644 --- a/drivers/ddr/altera/sdram_agilex.c +++ b/drivers/ddr/altera/sdram_agilex.c @@ -30,7 +30,7 @@ int sdram_mmr_init_full(struct udevice *dev) u32 i; int ret; phys_size_t hw_size; - bd_t bd = {0}; + struct bd_info bd = {0}; /* Ensure HMC clock is running */ if (poll_hmc_clock_status()) { diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c index 91f76e03c2d..2945f1e1df5 100644 --- a/drivers/ddr/altera/sdram_s10.c +++ b/drivers/ddr/altera/sdram_s10.c @@ -76,7 +76,7 @@ int sdram_mmr_init_full(struct udevice *dev) u32 i; int ret; phys_size_t hw_size; - bd_t bd = {0}; + struct bd_info bd = {0}; /* Enable access to DDR from CPU master */ clrbits_le32(CCU_REG_ADDR(CCU_CPU0_MPRT_ADBASE_DDRREG), diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c index 491f689c44d..8cb75fe02a2 100644 --- a/drivers/ddr/altera/sdram_soc64.c +++ b/drivers/ddr/altera/sdram_soc64.c @@ -132,7 +132,7 @@ void sdram_clear_mem(phys_addr_t addr, phys_size_t size) } } -void sdram_init_ecc_bits(bd_t *bd) +void sdram_init_ecc_bits(struct bd_info *bd) { phys_size_t size, size_init; phys_addr_t start_addr; @@ -176,7 +176,7 @@ void sdram_init_ecc_bits(bd_t *bd) (unsigned int)get_timer(start)); } -void sdram_size_check(bd_t *bd) +void sdram_size_check(struct bd_info *bd) { phys_size_t total_ram_check = 0; phys_size_t ram_check = 0; diff --git a/drivers/ddr/altera/sdram_soc64.h b/drivers/ddr/altera/sdram_soc64.h index 7b25a80ae26..4a830e7ec18 100644 --- a/drivers/ddr/altera/sdram_soc64.h +++ b/drivers/ddr/altera/sdram_soc64.h @@ -179,8 +179,8 @@ int emif_clear(struct altera_sdram_platdata *plat); int emif_reset(struct altera_sdram_platdata *plat); int poll_hmc_clock_status(void); void sdram_clear_mem(phys_addr_t addr, phys_size_t size); -void sdram_init_ecc_bits(bd_t *bd); -void sdram_size_check(bd_t *bd); +void sdram_init_ecc_bits(struct bd_info *bd); +void sdram_size_check(struct bd_info *bd); phys_size_t sdram_calculate_size(struct altera_sdram_platdata *plat); int sdram_mmr_init_full(struct udevice *dev); diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c index f3ccd021d80..0a05fb13bc9 100644 --- a/drivers/mmc/davinci_mmc.c +++ b/drivers/mmc/davinci_mmc.c @@ -457,7 +457,7 @@ static const struct dm_mmc_ops davinci_mmc_ops = { /* Called from board_mmc_init during startup. Can be called multiple times * depending on the number of slots available on board and controller */ -int davinci_mmc_init(bd_t *bis, struct davinci_mmc *host) +int davinci_mmc_init(struct bd_info *bis, struct davinci_mmc *host) { host->cfg.name = "davinci"; host->cfg.ops = &dmmc_ops; diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index a4b923ab99f..f6e0d43057e 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -746,7 +746,7 @@ static void esdhc_disable_for_no_card(void *blob) } #endif -void fdt_fixup_esdhc(void *blob, bd_t *bd) +void fdt_fixup_esdhc(void *blob, struct bd_info *bd) { const char *compat = "fsl,esdhc"; @@ -797,7 +797,7 @@ static const struct mmc_ops esdhc_ops = { .set_ios = esdhc_set_ios, }; -int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) +int fsl_esdhc_initialize(struct bd_info *bis, struct fsl_esdhc_cfg *cfg) { struct fsl_esdhc_plat *plat; struct fsl_esdhc_priv *priv; @@ -852,7 +852,7 @@ int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) return 0; } -int fsl_esdhc_mmc_init(bd_t *bis) +int fsl_esdhc_mmc_init(struct bd_info *bis) { struct fsl_esdhc_cfg *cfg; diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 5b61eeb2146..644f4651fb8 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1292,7 +1292,7 @@ static int fsl_esdhc_cfg_to_priv(struct fsl_esdhc_cfg *cfg, return 0; }; -int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) +int fsl_esdhc_initialize(struct bd_info *bis, struct fsl_esdhc_cfg *cfg) { struct fsl_esdhc_plat *plat; struct fsl_esdhc_priv *priv; @@ -1336,7 +1336,7 @@ int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) return 0; } -int fsl_esdhc_mmc_init(bd_t *bis) +int fsl_esdhc_mmc_init(struct bd_info *bis) { struct fsl_esdhc_cfg *cfg; @@ -1360,7 +1360,7 @@ __weak int esdhc_status_fixup(void *blob, const char *compat) return 0; } -void fdt_fixup_esdhc(void *blob, bd_t *bd) +void fdt_fixup_esdhc(void *blob, struct bd_info *bd) { const char *compat = "fsl,esdhc"; diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 7b5c55be7d9..f36d11ddc87 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2979,13 +2979,13 @@ int mmc_set_dsr(struct mmc *mmc, u16 val) } /* CPU-specific MMC initializations */ -__weak int cpu_mmc_init(bd_t *bis) +__weak int cpu_mmc_init(struct bd_info *bis) { return -1; } /* board-specific MMC initializations. */ -__weak int board_mmc_init(bd_t *bis) +__weak int board_mmc_init(struct bd_info *bis) { return -1; } @@ -2996,7 +2996,7 @@ void mmc_set_preinit(struct mmc *mmc, int preinit) } #if CONFIG_IS_ENABLED(DM_MMC) -static int mmc_probe(bd_t *bis) +static int mmc_probe(struct bd_info *bis) { int ret, i; struct uclass *uc; @@ -3025,7 +3025,7 @@ static int mmc_probe(bd_t *bis) return 0; } #else -static int mmc_probe(bd_t *bis) +static int mmc_probe(struct bd_info *bis) { if (board_mmc_init(bis) < 0) cpu_mmc_init(bis); @@ -3034,7 +3034,7 @@ static int mmc_probe(bd_t *bis) } #endif -int mmc_initialize(bd_t *bis) +int mmc_initialize(struct bd_info *bis) { static int initialized = 0; int ret; diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c index 8e7745e2332..03d5150b207 100644 --- a/drivers/mmc/mvebu_mmc.c +++ b/drivers/mmc/mvebu_mmc.c @@ -427,7 +427,7 @@ static struct mmc_config mvebu_mmc_cfg = { .b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT, }; -int mvebu_mmc_init(bd_t *bis) +int mvebu_mmc_init(struct bd_info *bis) { struct mmc *mmc; diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c index 269882b2027..0057273a2a7 100644 --- a/drivers/mmc/mxcmmc.c +++ b/drivers/mmc/mxcmmc.c @@ -504,7 +504,7 @@ static struct mmc_config mxcmci_cfg = { .b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT, }; -static int mxcmci_initialize(bd_t *bis) +static int mxcmci_initialize(struct bd_info *bis) { host->base = (struct mxcmci_regs *)CONFIG_MXC_MCI_REGS_BASE; @@ -518,7 +518,7 @@ static int mxcmci_initialize(bd_t *bis) return 0; } -int mxc_mmc_init(bd_t *bis) +int mxc_mmc_init(struct bd_info *bis) { return mxcmci_initialize(bis); } diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c index c6a06b9ca87..d48050ba8a5 100644 --- a/drivers/mmc/mxsmmc.c +++ b/drivers/mmc/mxsmmc.c @@ -162,7 +162,8 @@ static const struct mmc_ops mxsmmc_ops = { .init = mxsmmc_init, }; -int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int), int (*cd)(int)) +int mxsmmc_initialize(struct bd_info *bis, int id, int (*wp)(int), + int (*cd)(int)) { struct mmc *mmc = NULL; struct mxsmmc_priv *priv = NULL; diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c index 3ee119bcbcc..018891e173c 100644 --- a/drivers/net/armada100_fec.c +++ b/drivers/net/armada100_fec.c @@ -421,7 +421,7 @@ static void armdfec_init_rx_desc_ring(struct armdfec_device *darmdfec) darmdfec->p_rxdesc_curr = darmdfec->p_rxdesc; } -static int armdfec_init(struct eth_device *dev, bd_t *bd) +static int armdfec_init(struct eth_device *dev, struct bd_info *bd) { struct armdfec_device *darmdfec = to_darmdfec(dev); struct armdfec_reg *regs = darmdfec->regs; diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c index 4e4ad61da4e..e40b94ad892 100644 --- a/drivers/net/at91_emac.c +++ b/drivers/net/at91_emac.c @@ -315,7 +315,7 @@ int at91emac_UpdateLinkSpeed(at91_emac_t *emac) return 0; } -static int at91emac_init(struct eth_device *netdev, bd_t *bd) +static int at91emac_init(struct eth_device *netdev, struct bd_info *bd) { int i; u32 value; @@ -470,7 +470,7 @@ static int at91emac_write_hwaddr(struct eth_device *netdev) return 0; } -int at91emac_register(bd_t *bis, unsigned long iobase) +int at91emac_register(struct bd_info *bis, unsigned long iobase) { emac_device *emac; emac_device *emacfix; diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c index 28cb41272a9..402bcdb63ed 100644 --- a/drivers/net/ax88180.c +++ b/drivers/net/ax88180.c @@ -529,7 +529,7 @@ static void ax88180_halt (struct eth_device *dev) OUTW (dev, WAKEMOD, CMD); } -static int ax88180_init (struct eth_device *dev, bd_t * bd) +static int ax88180_init (struct eth_device *dev, struct bd_info * bd) { struct ax88180_private *priv = (struct ax88180_private *)dev->priv; unsigned short tmp_regval; @@ -701,7 +701,7 @@ static void ax88180_read_mac_addr (struct eth_device *dev) } /* Exported SubProgram Bodies */ -int ax88180_initialize (bd_t * bis) +int ax88180_initialize (struct bd_info * bis) { struct eth_device *dev; struct ax88180_private *priv; diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c index 2998d57c72f..c862c141461 100644 --- a/drivers/net/bcm-sf2-eth.c +++ b/drivers/net/bcm-sf2-eth.c @@ -147,7 +147,7 @@ static int bcm_sf2_eth_write_hwaddr(struct eth_device *dev) return eth->set_mac_addr(dev->enetaddr); } -static int bcm_sf2_eth_open(struct eth_device *dev, bd_t *bt) +static int bcm_sf2_eth_open(struct eth_device *dev, struct bd_info *bt) { struct eth_info *eth = (struct eth_info *)(dev->priv); struct eth_dma *dma = &(eth->dma); @@ -198,7 +198,7 @@ static void bcm_sf2_eth_close(struct eth_device *dev) eth->disable_mac(); } -int bcm_sf2_eth_register(bd_t *bis, u8 dev_num) +int bcm_sf2_eth_register(struct bd_info *bis, u8 dev_num) { struct eth_device *dev; struct eth_info *eth; diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c index 5dad69c0b76..8b2ee49b441 100644 --- a/drivers/net/calxedaxgmac.c +++ b/drivers/net/calxedaxgmac.c @@ -366,7 +366,7 @@ static void xgmac_hwmacaddr(struct eth_device *dev) writel(macaddr[0], ®s->macaddr[0].lo); } -static int xgmac_init(struct eth_device *dev, bd_t * bis) +static int xgmac_init(struct eth_device *dev, struct bd_info * bis) { struct xgmac_regs *regs = (struct xgmac_regs *)dev->iobase; struct calxeda_eth_dev *priv = dev->priv; diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c index 7ec95be6fcf..9440a91882f 100644 --- a/drivers/net/cs8900.c +++ b/drivers/net/cs8900.c @@ -146,7 +146,7 @@ void cs8900_halt(struct eth_device *dev) get_reg_init_bus(dev, PP_ChipID); } -static int cs8900_init(struct eth_device *dev, bd_t * bd) +static int cs8900_init(struct eth_device *dev, struct bd_info * bd) { uchar *enetaddr = dev->enetaddr; u16 id; diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index c55358ef839..0cb54e3214b 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -320,7 +320,7 @@ static int write_srom(struct eth_device *dev, u_long ioaddr, int index, return 1; } -static void update_srom(struct eth_device *dev, bd_t *bis) +static void update_srom(struct eth_device *dev, struct bd_info *bis) { static unsigned short eeprom[0x40] = { 0x140b, 0x6610, 0x0000, 0x0000, /* 00 */ @@ -356,7 +356,7 @@ static void update_srom(struct eth_device *dev, bd_t *bis) } #endif /* UPDATE_SROM */ -static void send_setup_frame(struct eth_device *dev, bd_t *bis) +static void send_setup_frame(struct eth_device *dev, struct bd_info *bis) { char setup_frame[SETUP_FRAME_LEN]; char *pa = &setup_frame[0]; @@ -484,7 +484,7 @@ static int dc21x4x_recv(struct eth_device *dev) return length; } -static int dc21x4x_init(struct eth_device *dev, bd_t *bis) +static int dc21x4x_init(struct eth_device *dev, struct bd_info *bis) { int i; int devbusfn = (int)dev->priv; @@ -547,7 +547,7 @@ static void dc21x4x_halt(struct eth_device *dev) pci_write_config_byte(devbusfn, PCI_CFDA_PSM, SLEEP); } -static void read_hw_addr(struct eth_device *dev, bd_t *bis) +static void read_hw_addr(struct eth_device *dev, struct bd_info *bis) { u_short tmp, *p = (u_short *)(&dev->enetaddr[0]); int i, j = 0; @@ -573,7 +573,7 @@ static struct pci_device_id supported[] = { { } }; -int dc21x4x_initialize(bd_t *bis) +int dc21x4x_initialize(struct bd_info *bis) { struct eth_device *dev; unsigned short status; diff --git a/drivers/net/designware.c b/drivers/net/designware.c index b89a68afe4a..1c0e8294078 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -512,7 +512,7 @@ static int dw_phy_init(struct dw_eth_dev *priv, void *dev) } #ifndef CONFIG_DM_ETH -static int dw_eth_init(struct eth_device *dev, bd_t *bis) +static int dw_eth_init(struct eth_device *dev, struct bd_info *bis) { int ret; diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index d575a625925..e46a269af90 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -279,7 +279,7 @@ dm9000_reset(void) /* Initialize dm9000 board */ -static int dm9000_init(struct eth_device *dev, bd_t *bd) +static int dm9000_init(struct eth_device *dev, struct bd_info *bd) { int i, oft, lnk; u8 io_mode; @@ -619,7 +619,7 @@ dm9000_phy_write(int reg, u16 value) DM9000_DBG("dm9000_phy_write(reg:0x%x, value:0x%x)\n", reg, value); } -int dm9000_initialize(bd_t *bis) +int dm9000_initialize(struct bd_info *bis) { struct eth_device *dev = &(dm9000_info.netdev); diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c index 98e9b2c663b..fbcf15f2680 100644 --- a/drivers/net/dnet.c +++ b/drivers/net/dnet.c @@ -312,7 +312,7 @@ static int dnet_phy_init(struct dnet_device *dnet) } } -static int dnet_init(struct eth_device *netdev, bd_t *bd) +static int dnet_init(struct eth_device *netdev, struct bd_info *bd) { struct dnet_device *dnet = to_dnet(netdev); u32 config; diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 008da4ab3e7..49be7667021 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -5634,7 +5634,7 @@ e1000_disable(struct eth_device *nic) INIT - set up ethernet interface(s) ***************************************************************************/ static int -e1000_init(struct eth_device *nic, bd_t *bis) +e1000_init(struct eth_device *nic, struct bd_info *bis) { struct e1000_hw *hw = nic->priv; @@ -5700,7 +5700,7 @@ PROBE - Look for an adapter, this routine's visible to the outside You should omit the last argument struct pci_device * for a non-PCI NIC ***************************************************************************/ int -e1000_initialize(bd_t * bis) +e1000_initialize(struct bd_info * bis) { unsigned int i; pci_dev_t devno; diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 45ea3b70fca..feba5327da4 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -779,7 +779,7 @@ done: } #ifndef CONFIG_DM_ETH -static int eepro100_init(struct eth_device *dev, bd_t *bis) +static int eepro100_init(struct eth_device *dev, struct bd_info *bis) { struct eepro100_priv *priv = container_of(dev, struct eepro100_priv, dev); @@ -819,7 +819,7 @@ static int eepro100_recv(struct eth_device *dev) return ret; } -int eepro100_initialize(bd_t *bis) +int eepro100_initialize(struct bd_info *bis) { struct eepro100_priv *priv; struct eth_device *dev; diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c index 894ffc9d2bd..0218349b045 100644 --- a/drivers/net/ep93xx_eth.c +++ b/drivers/net/ep93xx_eth.c @@ -165,7 +165,7 @@ static void ep93xx_mac_reset(struct eth_device *dev) } /* Eth device open */ -static int ep93xx_eth_open(struct eth_device *dev, bd_t *bd) +static int ep93xx_eth_open(struct eth_device *dev, struct bd_info *bd) { struct ep93xx_priv *priv = GET_PRIV(dev); struct mac_regs *mac = GET_REGS(dev); @@ -421,7 +421,7 @@ eth_send_out: } #if defined(CONFIG_MII) -int ep93xx_miiphy_initialize(bd_t * const bd) +int ep93xx_miiphy_initialize(struct bd_info * const bd) { int retval; struct mii_dev *mdiodev = mdio_alloc(); diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 81d0f3d7f89..fd589a0764c 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -756,7 +756,7 @@ U_BOOT_DRIVER(ethoc) = { #else -static int ethoc_init(struct eth_device *dev, bd_t *bd) +static int ethoc_init(struct eth_device *dev, struct bd_info *bd) { struct ethoc *priv = (struct ethoc *)dev->priv; diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 992180df869..469c7b7cef2 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1102,7 +1102,7 @@ struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id) #ifndef CONFIG_DM_ETH #ifdef CONFIG_PHYLIB -int fec_probe(bd_t *bd, int dev_id, uint32_t base_addr, +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, @@ -1199,7 +1199,8 @@ err1: return ret; } -int fecmxc_initialize_multi(bd_t *bd, int dev_id, int phy_id, uint32_t addr) +int fecmxc_initialize_multi(struct bd_info *bd, int dev_id, int phy_id, + uint32_t addr) { uint32_t base_mii; struct mii_dev *bus = NULL; @@ -1250,7 +1251,7 @@ int fecmxc_initialize_multi(bd_t *bd, int dev_id, int phy_id, uint32_t addr) } #ifdef CONFIG_FEC_MXC_PHYADDR -int fecmxc_initialize(bd_t *bd) +int fecmxc_initialize(struct bd_info *bd) { return fecmxc_initialize_multi(bd, -1, CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE); diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h index 659d62646f8..5ccde9193b2 100644 --- a/drivers/net/fec_mxc.h +++ b/drivers/net/fec_mxc.h @@ -244,7 +244,7 @@ struct fec_priv { int rbd_index; /* next receive BD to read */ struct fec_bd *tbd_base; /* TBD ring */ int tbd_index; /* next transmit BD to write */ - bd_t *bd; + struct bd_info *bd; uint8_t *tdb_ptr; int dev_id; struct mii_dev *bus; diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index 62396d3a16d..2f433cedd09 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -464,7 +464,7 @@ static void fmc_tx_port_graceful_stop_disable(struct fm_eth *fm_eth) } #ifndef CONFIG_DM_ETH -static int fm_eth_open(struct eth_device *dev, bd_t *bd) +static int fm_eth_open(struct eth_device *dev, struct bd_info *bd) #else static int fm_eth_open(struct udevice *dev) #endif diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 2cc8bbfb104..2fed64205cb 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -87,7 +87,7 @@ struct fm_eth_info fm_info[] = { #endif }; -int fm_standard_init(bd_t *bis) +int fm_standard_init(struct bd_info *bis) { int i; struct ccsr_fman *reg; diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c index 4cbfbc70ab5..e15c28d5005 100644 --- a/drivers/net/fm/memac_phy.c +++ b/drivers/net/fm/memac_phy.c @@ -166,7 +166,7 @@ int memac_mdio_reset(struct mii_dev *bus) } #ifndef CONFIG_DM_ETH -int fm_memac_mdio_init(bd_t *bis, struct memac_mdio_info *info) +int fm_memac_mdio_init(struct bd_info *bis, struct memac_mdio_info *info) { struct mii_dev *bus = mdio_alloc(); diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c index f6c98f2e296..22225c2f82f 100644 --- a/drivers/net/fm/tgec_phy.c +++ b/drivers/net/fm/tgec_phy.c @@ -105,7 +105,7 @@ static int tgec_mdio_reset(struct mii_dev *bus) return 0; } -int fm_tgec_mdio_init(bd_t *bis, struct tgec_mdio_info *info) +int fm_tgec_mdio_init(struct bd_info *bis, struct tgec_mdio_info *info) { struct mii_dev *bus = mdio_alloc(); diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index e516c3c1457..84db6be624a 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -971,7 +971,7 @@ unsigned long mc_get_dram_block_size(void) return dram_block_size; } -int fsl_mc_ldpaa_init(bd_t *bis) +int fsl_mc_ldpaa_init(struct bd_info *bis) { int i; @@ -1707,7 +1707,7 @@ err: return err; } -int fsl_mc_ldpaa_exit(bd_t *bd) +int fsl_mc_ldpaa_exit(struct bd_info *bd) { int err = 0; bool is_dpl_apply_status = false; diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index 73e92b7a0d2..f33529cb676 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -161,7 +161,7 @@ static void dbg_fec_regs(struct eth_device *dev) static void set_fec_duplex_speed(volatile fecdma_t *fecp, int dup_spd) { - bd_t *bd = gd->bd; + struct bd_info *bd = gd->bd; if ((dup_spd >> 16) == FULL) { /* Set maximum frame length */ diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c index 43040d4c3f8..d2edd1751c3 100644 --- a/drivers/net/fsl_mdio.c +++ b/drivers/net/fsl_mdio.c @@ -130,7 +130,7 @@ int tsec_phy_write(struct mii_dev *bus, int addr, int dev_addr, int regnum, } #ifndef CONFIG_DM_MDIO -int fsl_pq_mdio_init(bd_t *bis, struct fsl_pq_mdio_info *info) +int fsl_pq_mdio_init(struct bd_info *bis, struct fsl_pq_mdio_info *info) { struct mii_dev *bus = mdio_alloc(); diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 4aae7c43fea..79c64ec89ae 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -240,7 +240,7 @@ static void ftmac100_halt(struct eth_device *dev) return _ftmac100_halt(priv); } -static int ftmac100_init(struct eth_device *dev, bd_t *bd) +static int ftmac100_init(struct eth_device *dev, struct bd_info *bd) { struct ftmac100_data *priv = dev->priv; return _ftmac100_init(priv , dev->enetaddr); @@ -278,7 +278,7 @@ static int ftmac100_send(struct eth_device *dev, void *packet, int length) return _ftmac100_send(priv , packet , length); } -int ftmac100_initialize (bd_t *bd) +int ftmac100_initialize (struct bd_info *bd) { struct eth_device *dev; struct ftmac100_data *priv; diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c index 835346cb07d..265d813c4f8 100644 --- a/drivers/net/ftmac110.c +++ b/drivers/net/ftmac110.c @@ -257,7 +257,7 @@ static int ftmac110_reset(struct eth_device *dev) return 0; } -static int ftmac110_probe(struct eth_device *dev, bd_t *bis) +static int ftmac110_probe(struct eth_device *dev, struct bd_info *bis) { debug("ftmac110: probe\n"); @@ -404,7 +404,7 @@ static int ftmac110_mdio_write(struct mii_dev *bus, int addr, int devad, #endif /* #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) */ -int ftmac110_initialize(bd_t *bis) +int ftmac110_initialize(struct bd_info *bis) { int i, card_nr = 0; struct eth_device *dev; diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index 3ff173ad339..1773c7671f3 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c @@ -505,7 +505,7 @@ static void ks8851_mll_write_hwaddr_common(struct ks_net *ks, u8 enetaddr[6]) } #ifndef CONFIG_DM_ETH -static int ks8851_mll_init(struct eth_device *dev, bd_t *bd) +static int ks8851_mll_init(struct eth_device *dev, struct bd_info *bd) { struct ks_net *ks = container_of(dev, struct ks_net, dev); diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c index 13900f10b1c..c2f611144db 100644 --- a/drivers/net/lan91c96.c +++ b/drivers/net/lan91c96.c @@ -114,7 +114,7 @@ . print a warning and set the environment and other globals with the default. . If an EEPROM is present it really should be consulted. */ -static int smc_get_ethaddr(bd_t *bd, struct eth_device *dev); +static int smc_get_ethaddr(struct bd_info *bd, struct eth_device *dev); static int get_rom_mac(struct eth_device *dev, unsigned char *v_rom_mac); /* ------------------------------------------------------------ @@ -471,7 +471,7 @@ static int smc_send_packet(struct eth_device *dev, void *packet, * Set up everything, reset the card, etc .. * */ -static int smc_open(bd_t *bd, struct eth_device *dev) +static int smc_open(struct bd_info *bd, struct eth_device *dev) { int i, err; /* used to set hw ethernet address */ @@ -674,7 +674,7 @@ static void print_packet(byte *buf, int length) } #endif /* SMC_DEBUG > 2 */ -static int lan91c96_init(struct eth_device *dev, bd_t *bd) +static int lan91c96_init(struct eth_device *dev, struct bd_info *bd) { return smc_open(bd, dev); } @@ -701,7 +701,7 @@ static int lan91c96_send(struct eth_device *dev, void *packet, * found, the environment takes precedence. */ -static int smc_get_ethaddr(bd_t *bd, struct eth_device *dev) +static int smc_get_ethaddr(struct bd_info *bd, struct eth_device *dev) { uchar v_mac[6]; diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c index f68daaaff56..3f281a515c6 100644 --- a/drivers/net/lpc32xx_eth.c +++ b/drivers/net/lpc32xx_eth.c @@ -597,7 +597,7 @@ int lpc32xx_eth_phylib_init(struct eth_device *dev, int phyid) } #endif -int lpc32xx_eth_initialize(bd_t *bis) +int lpc32xx_eth_initialize(struct bd_info *bis) { struct eth_device *dev = &lpc32xx_eth.dev; struct lpc32xx_eth_registers *regs = lpc32xx_eth.regs; diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 424ca59707f..b80a259ff75 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1056,7 +1056,7 @@ static int macb_recv(struct eth_device *netdev) } } -static int macb_init(struct eth_device *netdev, bd_t *bd) +static int macb_init(struct eth_device *netdev, struct bd_info *bd) { struct macb_device *macb = to_macb(netdev); diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index 697549301f3..1a8351be1c5 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -89,7 +89,7 @@ static void fec_reset(struct fec_info_s *info) static void set_fec_duplex_speed(volatile fec_t *fecp, int dup_spd) { - bd_t *bd = gd->bd; + struct bd_info *bd = gd->bd; if ((dup_spd >> 16) == FULL) { /* Set maximum frame length */ diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c index f9f7dd7cb36..12be584638f 100644 --- a/drivers/net/mpc8xx_fec.c +++ b/drivers/net/mpc8xx_fec.c @@ -112,13 +112,13 @@ static struct common_buf_desc __iomem *rtx; static int fec_send(struct eth_device *dev, void *packet, int length); static int fec_recv(struct eth_device *dev); -static int fec_init(struct eth_device *dev, bd_t *bd); +static int fec_init(struct eth_device *dev, struct bd_info *bd); static void fec_halt(struct eth_device *dev); #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) static void __mii_init(void); #endif -int fec_initialize(bd_t *bis) +int fec_initialize(struct bd_info *bis) { struct eth_device *dev; struct ether_fcc_info_s *efis; @@ -345,7 +345,7 @@ static inline void fec_half_duplex(struct eth_device *dev) static void fec_pin_init(int fecidx) { - bd_t *bd = gd->bd; + struct bd_info *bd = gd->bd; immap_t __iomem *immr = (immap_t __iomem *)CONFIG_SYS_IMMR; /* @@ -496,7 +496,7 @@ static int fec_reset(fec_t __iomem *fecp) return 0; } -static int fec_init(struct eth_device *dev, bd_t *bd) +static int fec_init(struct eth_device *dev, struct bd_info *bd) { struct ether_fcc_info_s *efis = dev->priv; immap_t __iomem *immr = (immap_t __iomem *)CONFIG_SYS_IMMR; diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index 7974dfc78da..86b1b8cee5d 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -821,7 +821,7 @@ error1: } #ifndef CONFIG_DM_ETH -int mvgbe_initialize(bd_t *bis) +int mvgbe_initialize(struct bd_info *bis) { struct mvgbe_device *dmvgbe; struct eth_device *dev; diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index bf6fa8f2ba2..bfd8cc396b9 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c @@ -230,7 +230,7 @@ static void write_eeprom(struct eth_device *dev, long addr, int location, #endif static int read_eeprom(struct eth_device *dev, long addr, int location); static int mdio_read(struct eth_device *dev, int phy_id, int location); -static int natsemi_init(struct eth_device *dev, bd_t * bis); +static int natsemi_init(struct eth_device *dev, struct bd_info * bis); static void natsemi_reset(struct eth_device *dev); static void natsemi_init_rxfilter(struct eth_device *dev); static void natsemi_init_txd(struct eth_device *dev); @@ -287,7 +287,7 @@ OUTL(struct eth_device *dev, int command, u_long addr) */ int -natsemi_initialize(bd_t * bis) +natsemi_initialize(struct bd_info * bis) { pci_dev_t devno; int card_number = 0; @@ -556,7 +556,7 @@ mdio_read(struct eth_device *dev, int phy_id, int location) */ static int -natsemi_init(struct eth_device *dev, bd_t * bis) +natsemi_init(struct eth_device *dev, struct bd_info * bis) { natsemi_reset(dev); diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c index 55145da2bb6..f6673f5e4c6 100644 --- a/drivers/net/ne2000_base.c +++ b/drivers/net/ne2000_base.c @@ -720,7 +720,7 @@ static int ne2k_setup_driver(struct eth_device *dev) return 0; } -static int ne2k_init(struct eth_device *dev, bd_t *bd) +static int ne2k_init(struct eth_device *dev, struct bd_info *bd) { dp83902a_start(dev->enetaddr); initialized = 1; diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c index c292abad07f..d79872af093 100644 --- a/drivers/net/ns8382x.c +++ b/drivers/net/ns8382x.c @@ -252,7 +252,7 @@ static unsigned char rxb[NUM_RX_DESC * RX_BUF_SIZE] static int mdio_read(struct eth_device *dev, int phy_id, int addr); static void mdio_write(struct eth_device *dev, int phy_id, int addr, int value); static void mdio_sync(struct eth_device *dev, u32 offset); -static int ns8382x_init(struct eth_device *dev, bd_t * bis); +static int ns8382x_init(struct eth_device *dev, struct bd_info * bis); static void ns8382x_reset(struct eth_device *dev); static void ns8382x_init_rxfilter(struct eth_device *dev); static void ns8382x_init_txd(struct eth_device *dev); @@ -304,7 +304,7 @@ OUTL(struct eth_device *dev, int command, u_long addr) */ int -ns8382x_initialize(bd_t * bis) +ns8382x_initialize(struct bd_info * bis) { pci_dev_t devno; int card_number = 0; @@ -530,7 +530,7 @@ mdio_write(struct eth_device *dev, int phy_id, int addr, int value) */ static int -ns8382x_init(struct eth_device *dev, bd_t * bis) +ns8382x_init(struct eth_device *dev, struct bd_info * bis) { u32 config; diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c index 0928bc398b1..559560860bd 100644 --- a/drivers/net/pcnet.c +++ b/drivers/net/pcnet.c @@ -459,7 +459,7 @@ static void pcnet_halt_common(struct pcnet_priv *lp) } #ifndef CONFIG_DM_ETH -static int pcnet_init(struct eth_device *dev, bd_t *bis) +static int pcnet_init(struct eth_device *dev, struct bd_info *bis) { struct pcnet_priv *lp = dev->priv; @@ -495,7 +495,7 @@ static void pcnet_halt(struct eth_device *dev) pcnet_halt_common(lp); } -int pcnet_initialize(bd_t *bis) +int pcnet_initialize(struct bd_info *bis) { pci_dev_t devbusfn; struct eth_device *dev; diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c index 8a6f305893b..71f2aba4c70 100644 --- a/drivers/net/rtl8139.c +++ b/drivers/net/rtl8139.c @@ -564,7 +564,7 @@ static int rtl8139_bcast_addr(struct eth_device *dev, const u8 *bcast_mac, return 0; } -static int rtl8139_init(struct eth_device *dev, bd_t *bis) +static int rtl8139_init(struct eth_device *dev, struct bd_info *bis) { struct rtl8139_priv *priv = container_of(dev, struct rtl8139_priv, dev); @@ -601,7 +601,7 @@ static int rtl8139_recv(struct eth_device *dev) return ret; } -int rtl8139_initialize(bd_t *bis) +int rtl8139_initialize(struct bd_info *bis) { struct rtl8139_priv *priv; struct eth_device *dev; diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index fb4fae20e53..2e1304e44d1 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -901,7 +901,7 @@ static int rtl8169_eth_start(struct udevice *dev) /************************************************************************** RESET - Finish setting up the ethernet interface ***************************************************************************/ -static int rtl_reset(struct eth_device *dev, bd_t *bis) +static int rtl_reset(struct eth_device *dev, struct bd_info *bis) { rtl8169_common_start((pci_dev_t)(unsigned long)dev->priv, dev->enetaddr, dev->iobase); @@ -1119,7 +1119,7 @@ static int rtl_init(unsigned long dev_ioaddr, const char *name, } #ifndef CONFIG_DM_ETH -int rtl8169_initialize(bd_t *bis) +int rtl8169_initialize(struct bd_info *bis) { pci_dev_t devno; int card_number = 0; diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index b26fc7b8eb1..8823769eddf 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -577,7 +577,7 @@ static int sh_eth_recv_legacy(struct eth_device *dev) return sh_eth_recv_common(eth); } -static int sh_eth_init_legacy(struct eth_device *dev, bd_t *bd) +static int sh_eth_init_legacy(struct eth_device *dev, struct bd_info *bd) { struct sh_eth_dev *eth = dev->priv; int ret; @@ -611,7 +611,7 @@ void sh_eth_halt_legacy(struct eth_device *dev) sh_eth_stop(eth); } -int sh_eth_initialize(bd_t *bd) +int sh_eth_initialize(struct bd_info *bd) { int ret = 0; struct sh_eth_dev *eth = NULL; diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c index 23265eff936..ec4e8e928cb 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -627,7 +627,7 @@ static int smc_write_hwaddr(struct eth_device *dev) * Set up everything, reset the card, etc .. * */ -static int smc_init(struct eth_device *dev, bd_t *bd) +static int smc_init(struct eth_device *dev, struct bd_info *bd) { swap_to(ETHERNET); diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c index 9d4332f4504..d6fefe53068 100644 --- a/drivers/net/ti/cpsw.c +++ b/drivers/net/ti/cpsw.c @@ -929,7 +929,7 @@ int _cpsw_register(struct cpsw_priv *priv) } #ifndef CONFIG_DM_ETH -static int cpsw_init(struct eth_device *dev, bd_t *bis) +static int cpsw_init(struct eth_device *dev, struct bd_info *bis) { struct cpsw_priv *priv = dev->priv; diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 3d75acb6b4e..5d12e4b7755 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -554,7 +554,7 @@ static void startup_tsec(struct tsec_private *priv) * This allows U-Boot to find the first active controller. */ #ifndef CONFIG_DM_ETH -static int tsec_init(struct eth_device *dev, bd_t *bd) +static int tsec_init(struct eth_device *dev, struct bd_info *bd) #else static int tsec_init(struct udevice *dev) #endif @@ -701,7 +701,8 @@ static int init_phy(struct tsec_private *priv) * Initialize device structure. Returns success if PHY * initialization succeeded (i.e. if it recognizes the PHY) */ -static int tsec_initialize(bd_t *bis, struct tsec_info_struct *tsec_info) +static int tsec_initialize(struct bd_info *bis, + struct tsec_info_struct *tsec_info) { struct tsec_private *priv; struct eth_device *dev; @@ -760,7 +761,8 @@ static int tsec_initialize(bd_t *bis, struct tsec_info_struct *tsec_info) * * Returns the number of TSEC devices that were initialized */ -int tsec_eth_init(bd_t *bis, struct tsec_info_struct *tsecs, int num) +int tsec_eth_init(struct bd_info *bis, struct tsec_info_struct *tsecs, + int num) { int i; int count = 0; @@ -775,7 +777,7 @@ int tsec_eth_init(bd_t *bis, struct tsec_info_struct *tsecs, int num) return count; } -int tsec_standard_init(bd_t *bis) +int tsec_standard_init(struct bd_info *bis) { struct fsl_pq_mdio_info info; diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c index cfdd1137bea..3191868cae5 100644 --- a/drivers/net/uli526x.c +++ b/drivers/net/uli526x.c @@ -184,7 +184,7 @@ static void uli526x_init(struct eth_device *); static void uli526x_set_phyxcer(struct uli526x_board_info *); -static int uli526x_init_one(struct eth_device *, bd_t *); +static int uli526x_init_one(struct eth_device *, struct bd_info *); static void uli526x_disable(struct eth_device *); static void set_mac_addr(struct eth_device *); @@ -200,7 +200,7 @@ static struct pci_device_id uli526x_pci_tbl[] = { * Search ULI526X board, register it */ -int uli526x_initialize(bd_t *bis) +int uli526x_initialize(struct bd_info *bis) { pci_dev_t devno; int card_number = 0; @@ -255,7 +255,7 @@ int uli526x_initialize(bd_t *bis) return card_number; } -static int uli526x_init_one(struct eth_device *dev, bd_t *bis) +static int uli526x_init_one(struct eth_device *dev, struct bd_info *bis) { struct uli526x_board_info *db = dev->priv; diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c index c438dab5619..29f26b4b332 100644 --- a/drivers/net/vsc9953.c +++ b/drivers/net/vsc9953.c @@ -2605,7 +2605,7 @@ static void vsc9953_vcap_init(void) __LINE__); } -void vsc9953_init(bd_t *bis) +void vsc9953_init(struct bd_info *bis) { u32 i; u32 hdx_cfg = 0; diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 9ab3539a49c..834526c5a47 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -939,7 +939,7 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node, /* Add a region for our local memory */ #ifdef CONFIG_NR_DRAM_BANKS - bd_t *bd = gd->bd; + struct bd_info *bd = gd->bd; if (!bd) return; diff --git a/drivers/pci/pcie_fsl_fixup.c b/drivers/pci/pcie_fsl_fixup.c index cbdc0ef291c..f4e227895d1 100644 --- a/drivers/pci/pcie_fsl_fixup.c +++ b/drivers/pci/pcie_fsl_fixup.c @@ -35,7 +35,7 @@ static void ft_fsl_pcie_setup(void *blob, struct fsl_pcie *pcie) } /* Fixup Kernel DT for PCIe */ -void pci_of_setup(void *blob, bd_t *bd) +void pci_of_setup(void *blob, struct bd_info *bd) { struct fsl_pcie *pcie; @@ -44,7 +44,7 @@ void pci_of_setup(void *blob, bd_t *bd) } #else -void pci_of_setup(void *blob, bd_t *bd) +void pci_of_setup(void *blob, struct bd_info *bd) { } #endif diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index 25a3c3870cb..76e680481a7 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -266,7 +266,7 @@ static void ft_pcie_ls_setup(void *blob, struct ls_pcie *pcie) } /* Fixup Kernel DT for PCIe */ -void ft_pci_setup_ls(void *blob, bd_t *bd) +void ft_pci_setup_ls(void *blob, struct bd_info *bd) { struct ls_pcie *pcie; @@ -279,7 +279,7 @@ void ft_pci_setup_ls(void *blob, bd_t *bd) } #else /* !CONFIG_OF_BOARD_SETUP */ -void ft_pci_setup_ls(void *blob, bd_t *bd) +void ft_pci_setup_ls(void *blob, struct bd_info *bd) { } #endif diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c index c11c691b864..fef0a75f115 100644 --- a/drivers/pci/pcie_layerscape_fixup_common.c +++ b/drivers/pci/pcie_layerscape_fixup_common.c @@ -13,7 +13,7 @@ #include <asm/arch/soc.h> #include "pcie_layerscape_fixup_common.h" -void ft_pci_setup(void *blob, bd_t *bd) +void ft_pci_setup(void *blob, struct bd_info *bd) { #if defined(CONFIG_PCIE_LAYERSCAPE_GEN4) uint svr; diff --git a/drivers/pci/pcie_layerscape_fixup_common.h b/drivers/pci/pcie_layerscape_fixup_common.h index e1970a57905..70bd3f0cba3 100644 --- a/drivers/pci/pcie_layerscape_fixup_common.h +++ b/drivers/pci/pcie_layerscape_fixup_common.h @@ -11,10 +11,10 @@ #include <common.h> -void ft_pci_setup_ls(void *blob, bd_t *bd); +void ft_pci_setup_ls(void *blob, struct bd_info *bd); #ifdef CONFIG_PCIE_LAYERSCAPE_GEN4 -void ft_pci_setup_ls_gen4(void *blob, bd_t *bd); +void ft_pci_setup_ls_gen4(void *blob, struct bd_info *bd); #endif /* CONFIG_PCIE_LAYERSCAPE_GEN4 */ int pcie_next_streamid(int currentid, int id); int pcie_board_fix_fdt(void *fdt); diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c index 1975004e598..375ce45839b 100644 --- a/drivers/pci/pcie_layerscape_gen4_fixup.c +++ b/drivers/pci/pcie_layerscape_gen4_fixup.c @@ -225,7 +225,7 @@ static void ft_pcie_layerscape_gen4_setup(void *blob, struct ls_pcie_g4 *pcie) } /* Fixup Kernel DT for PCIe */ -void ft_pci_setup_ls_gen4(void *blob, bd_t *bd) +void ft_pci_setup_ls_gen4(void *blob, struct bd_info *bd) { struct ls_pcie_g4 *pcie; @@ -238,7 +238,7 @@ void ft_pci_setup_ls_gen4(void *blob, bd_t *bd) } #else /* !CONFIG_OF_BOARD_SETUP */ -void ft_pci_setup_ls_gen4(void *blob, bd_t *bd) +void ft_pci_setup_ls_gen4(void *blob, struct bd_info *bd) { } #endif diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c index 849f191d6d1..01434543873 100644 --- a/drivers/qe/uec.c +++ b/drivers/qe/uec.c @@ -1189,7 +1189,7 @@ static int uec_startup(uec_private_t *uec) return 0; } -static int uec_init(struct eth_device* dev, bd_t *bd) +static int uec_init(struct eth_device* dev, struct bd_info *bd) { uec_private_t *uec; int err, i; @@ -1349,7 +1349,7 @@ static int uec_recv(struct eth_device* dev) return 1; } -int uec_initialize(bd_t *bis, uec_info_t *uec_info) +int uec_initialize(struct bd_info *bis, uec_info_t *uec_info) { struct eth_device *dev; int i; @@ -1416,7 +1416,7 @@ int uec_initialize(bd_t *bis, uec_info_t *uec_info) return 1; } -int uec_eth_init(bd_t *bis, uec_info_t *uecs, int num) +int uec_eth_init(struct bd_info *bis, uec_info_t *uecs, int num) { int i; @@ -1426,7 +1426,7 @@ int uec_eth_init(bd_t *bis, uec_info_t *uecs, int num) return 0; } -int uec_standard_init(bd_t *bis) +int uec_standard_init(struct bd_info *bis) { return uec_eth_init(bis, uec_info, ARRAY_SIZE(uec_info)); } diff --git a/drivers/qe/uec.h b/drivers/qe/uec.h index 5f8baefb103..6de2ac44f86 100644 --- a/drivers/qe/uec.h +++ b/drivers/qe/uec.h @@ -735,7 +735,7 @@ typedef struct uec_private { int oldlink; } uec_private_t; -int uec_initialize(bd_t *bis, uec_info_t *uec_info); -int uec_eth_init(bd_t *bis, uec_info_t *uecs, int num); -int uec_standard_init(bd_t *bis); +int uec_initialize(struct bd_info *bis, uec_info_t *uec_info); +int uec_eth_init(struct bd_info *bis, uec_info_t *uecs, int num); +int uec_standard_init(struct bd_info *bis); #endif /* __UEC_H__ */ diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c index 0759ec774ab..4d7a2acd8e5 100644 --- a/drivers/usb/common/fsl-dt-fixup.c +++ b/drivers/usb/common/fsl-dt-fixup.c @@ -132,7 +132,7 @@ static int fsl_fdt_fixup_erratum(int *usb_erratum_off, void *blob, return 0; } -void fsl_fdt_fixup_dr_usb(void *blob, bd_t *bd) +void fsl_fdt_fixup_dr_usb(void *blob, struct bd_info *bd) { static const char * const modes[] = { "host", "peripheral", "otg" }; static const char * const phys[] = { "ulpi", "utmi", "utmi_dual" }; diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c index db75ae2498c..ac4a27fff20 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -498,7 +498,7 @@ static int asix_send_common(struct ueth_data *dev, void *packet, int length) /* * Asix callbacks */ -static int asix_init(struct eth_device *eth, bd_t *bd) +static int asix_init(struct eth_device *eth, struct bd_info *bd) { struct ueth_data *dev = (struct ueth_data *)eth->priv; diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c index 381bef2bed8..c142b8b19bf 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -509,7 +509,7 @@ static int asix_send_common(struct ueth_data *dev, /* * Asix callbacks */ -static int asix_init(struct eth_device *eth, bd_t *bd) +static int asix_init(struct eth_device *eth, struct bd_info *bd) { struct ueth_data *dev = (struct ueth_data *)eth->priv; struct asix_private *dev_priv = (struct asix_private *)dev->dev_priv; diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c index 0cb7dbc8fb8..c829a436a34 100644 --- a/drivers/usb/eth/mcs7830.c +++ b/drivers/usb/eth/mcs7830.c @@ -586,7 +586,7 @@ static int mcs7830_recv_common(struct ueth_data *ueth, uint8_t *buf) * ensures that the link is up and subsequent send() and recv() calls can * exchange ethernet frames */ -static int mcs7830_init(struct eth_device *eth, bd_t *bd) +static int mcs7830_init(struct eth_device *eth, struct bd_info *bd) { struct ueth_data *dev = eth->priv; diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c index f201a1789b6..1845d957f97 100644 --- a/drivers/usb/eth/r8152.c +++ b/drivers/usb/eth/r8152.c @@ -1249,7 +1249,7 @@ static int r8152_send_common(struct ueth_data *ueth, void *packet, int length) } #ifndef CONFIG_DM_ETH -static int r8152_init(struct eth_device *eth, bd_t *bd) +static int r8152_init(struct eth_device *eth, struct bd_info *bd) { struct ueth_data *dev = (struct ueth_data *)eth->priv; struct r8152 *tp = (struct r8152 *)dev->dev_priv; diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index d3532df141f..b293a808a3d 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -716,7 +716,7 @@ static int smsc95xx_send_common(struct ueth_data *dev, void *packet, int length) /* * Smsc95xx callbacks */ -static int smsc95xx_init(struct eth_device *eth, bd_t *bd) +static int smsc95xx_init(struct eth_device *eth, struct bd_info *bd) { struct ueth_data *dev = (struct ueth_data *)eth->priv; struct usb_device *udev = dev->pusb_dev; diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 6f04523f15e..a939918e973 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -2523,7 +2523,7 @@ static void _usb_eth_halt(struct ether_priv *priv) } #ifndef CONFIG_DM_ETH -static int usb_eth_init(struct eth_device *netdev, bd_t *bd) +static int usb_eth_init(struct eth_device *netdev, struct bd_info *bd) { struct ether_priv *priv = (struct ether_priv *)netdev->priv; @@ -2571,7 +2571,7 @@ void usb_eth_halt(struct eth_device *netdev) _usb_eth_halt(priv); } -int usb_eth_initialize(bd_t *bi) +int usb_eth_initialize(struct bd_info *bi) { struct eth_device *netdev = &l_priv->netdev; diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 6495e22b1aa..badade353ec 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -1982,7 +1982,7 @@ static void *video_logo(void) static int cfb_fb_is_in_dram(void) { - bd_t *bd = gd->bd; + struct bd_info *bd = gd->bd; #if defined(CONFIG_ARM) || defined(CONFIG_NDS32) || \ defined(CONFIG_SANDBOX) || defined(CONFIG_X86) ulong start, end; |