From 09140113108541b95d340f3c7b6ee597d31ccc73 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:03 -0600 Subject: command: Remove the cmd_tbl_t typedef We should not use typedefs in U-Boot. They cannot be used as forward declarations which means that header files must include the full header to access them. Drop the typedef and rename the struct to remove the _s suffix which is now not useful. This requires quite a few header-file additions. Signed-off-by: Simon Glass --- drivers/clk/mpc83xx_clk.c | 4 +++- drivers/ddr/fsl/interactive.c | 1 + drivers/firmware/psci.c | 3 ++- drivers/gpio/pca953x.c | 8 +++++--- drivers/gpio/tca642x.c | 8 +++++--- drivers/misc/altera_sysid.c | 2 +- drivers/misc/ds4510.c | 6 +++--- drivers/misc/rockchip-efuse.c | 4 ++-- drivers/net/e1000.c | 5 +++-- drivers/net/e1000.h | 4 ++-- drivers/net/e1000_spi.c | 21 +++++++++++---------- drivers/net/fsl-mc/mc.c | 3 ++- drivers/net/pfe_eth/pfe_cmd.c | 15 ++++++++------- drivers/net/phy/b53.c | 7 ++++--- drivers/net/phy/mv88e6352.c | 7 ++++--- drivers/net/vsc9953.c | 1 + drivers/power/axp152.c | 2 +- drivers/power/axp209.c | 2 +- drivers/power/axp221.c | 2 +- drivers/power/axp809.c | 3 ++- drivers/power/axp818.c | 3 ++- drivers/power/mt6323.c | 2 +- drivers/power/power_core.c | 4 +++- drivers/power/twl4030.c | 3 ++- drivers/qe/qe.c | 2 +- drivers/ram/stm32mp1/stm32mp1_interactive.c | 11 ++++++----- drivers/sysreset/sysreset-uclass.c | 5 +++-- drivers/sysreset/sysreset_mpc83xx.c | 1 + drivers/usb/gadget/f_fastboot.c | 1 + drivers/usb/gadget/f_rockusb.c | 1 + drivers/video/cfb_console.c | 4 +++- drivers/video/lg4573.c | 5 +++-- drivers/video/vidconsole-uclass.c | 5 +++-- 33 files changed, 92 insertions(+), 63 deletions(-) (limited to 'drivers') diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c index 4183db2845..fa519a4430 100644 --- a/drivers/clk/mpc83xx_clk.c +++ b/drivers/clk/mpc83xx_clk.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -390,7 +391,8 @@ U_BOOT_DRIVER(mpc83xx_clk) = { .bind = mpc83xx_clk_bind, }; -static int do_clocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_clocks(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { int i; char buf[32]; diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c index 8e171e67fe..8c82d524a3 100644 --- a/drivers/ddr/fsl/interactive.c +++ b/drivers/ddr/fsl/interactive.c @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 394f30fa88..572abfa536 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -131,7 +132,7 @@ void reset_misc(void) #endif /* CONFIG_PSCI_RESET */ #ifdef CONFIG_CMD_POWEROFF -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { do_psci_probe(); diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index fda8054d53..4ab8cee2d1 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c @@ -9,6 +9,7 @@ */ #include +#include #include #include @@ -192,7 +193,7 @@ static int pca953x_info(uint8_t chip) return 0; } -static cmd_tbl_t cmd_pca953x[] = { +static struct cmd_tbl cmd_pca953x[] = { U_BOOT_CMD_MKENT(device, 3, 0, (void *)PCA953X_CMD_DEVICE, "", ""), U_BOOT_CMD_MKENT(output, 4, 0, (void *)PCA953X_CMD_OUTPUT, "", ""), U_BOOT_CMD_MKENT(input, 3, 0, (void *)PCA953X_CMD_INPUT, "", ""), @@ -200,13 +201,14 @@ static cmd_tbl_t cmd_pca953x[] = { U_BOOT_CMD_MKENT(info, 2, 0, (void *)PCA953X_CMD_INFO, "", ""), }; -static int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_pca953x(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { static uint8_t chip = CONFIG_SYS_I2C_PCA953X_ADDR; int ret = CMD_RET_USAGE, val; ulong ul_arg2 = 0; ulong ul_arg3 = 0; - cmd_tbl_t *c; + struct cmd_tbl *c; c = find_cmd_tbl(argv[1], cmd_pca953x, ARRAY_SIZE(cmd_pca953x)); diff --git a/drivers/gpio/tca642x.c b/drivers/gpio/tca642x.c index 730460a999..463cfe879a 100644 --- a/drivers/gpio/tca642x.c +++ b/drivers/gpio/tca642x.c @@ -21,6 +21,7 @@ */ #include +#include #include #include @@ -212,7 +213,7 @@ static int tca642x_info(uchar chip) return 0; } -static cmd_tbl_t cmd_tca642x[] = { +static struct cmd_tbl cmd_tca642x[] = { U_BOOT_CMD_MKENT(device, 3, 0, (void *)TCA642X_CMD_DEVICE, "", ""), U_BOOT_CMD_MKENT(output, 4, 0, (void *)TCA642X_CMD_OUTPUT, "", ""), U_BOOT_CMD_MKENT(input, 3, 0, (void *)TCA642X_CMD_INPUT, "", ""), @@ -220,7 +221,8 @@ static cmd_tbl_t cmd_tca642x[] = { U_BOOT_CMD_MKENT(info, 2, 0, (void *)TCA642X_CMD_INFO, "", ""), }; -static int do_tca642x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_tca642x(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { static uchar chip = CONFIG_SYS_I2C_TCA642X_ADDR; int ret = CMD_RET_USAGE, val; @@ -228,7 +230,7 @@ static int do_tca642x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) uint8_t bank_shift; ulong ul_arg2 = 0; ulong ul_arg3 = 0; - cmd_tbl_t *c; + struct cmd_tbl *c; c = find_cmd_tbl(argv[1], cmd_tca642x, ARRAY_SIZE(cmd_tca642x)); diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c index eff33f7343..387c70b070 100644 --- a/drivers/misc/altera_sysid.c +++ b/drivers/misc/altera_sysid.c @@ -44,7 +44,7 @@ void display_sysid(void) printf("SYSID: %08x, %s", sysid[0], asc); } -int do_sysid(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_sysid(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { display_sysid(); return 0; diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index bf20a833ec..0b37e8a4e4 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -233,7 +233,7 @@ static int ds4510_info(uint8_t chip) return 0; } -cmd_tbl_t cmd_ds4510[] = { +struct cmd_tbl cmd_ds4510[] = { U_BOOT_CMD_MKENT(device, 3, 0, (void *)DS4510_CMD_DEVICE, "", ""), U_BOOT_CMD_MKENT(nv, 3, 0, (void *)DS4510_CMD_NV, "", ""), U_BOOT_CMD_MKENT(output, 4, 0, (void *)DS4510_CMD_OUTPUT, "", ""), @@ -246,10 +246,10 @@ cmd_tbl_t cmd_ds4510[] = { U_BOOT_CMD_MKENT(sram, 6, 0, (void *)DS4510_CMD_SRAM, "", ""), }; -int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_ds4510(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { static uint8_t chip = 0x51; - cmd_tbl_t *c; + struct cmd_tbl *c; ulong ul_arg2 = 0; ulong ul_arg3 = 0; int tmp; diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c index 2520c6a38e..46ce6305fe 100644 --- a/drivers/misc/rockchip-efuse.c +++ b/drivers/misc/rockchip-efuse.c @@ -43,8 +43,8 @@ struct rockchip_efuse_platdata { }; #if defined(DEBUG) -static int dump_efuses(cmd_tbl_t *cmdtp, int flag, - int argc, char * const argv[]) +static int dump_efuses(struct cmd_tbl *cmdtp, int flag, + int argc, char *const argv[]) { /* * N.B.: This function is tailored towards the RK3399 and assumes that diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 7e98449cfa..82b1db3fb3 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -30,6 +30,7 @@ tested on both gig copper and gig fiber boards */ #include +#include #include #include #include @@ -5761,8 +5762,8 @@ struct e1000_hw *e1000_find_card(unsigned int cardnum) #endif /* !CONFIG_DM_ETH */ #ifdef CONFIG_CMD_E1000 -static int do_e1000(cmd_tbl_t *cmdtp, int flag, - int argc, char * const argv[]) +static int do_e1000(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { unsigned char *mac = NULL; #ifdef CONFIG_DM_ETH diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h index 2ae3085515..19ed4777d9 100644 --- a/drivers/net/e1000.h +++ b/drivers/net/e1000.h @@ -74,8 +74,8 @@ void e1000_lower_ee_clk(struct e1000_hw *hw, uint32_t *eecd); #endif #ifdef CONFIG_E1000_SPI -int do_e1000_spi(cmd_tbl_t *cmdtp, struct e1000_hw *hw, - int argc, char * const argv[]); +int do_e1000_spi(struct cmd_tbl *cmdtp, struct e1000_hw *hw, + int argc, char *const argv[]); #endif /* Enumerated types specific to the e1000 hardware */ diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c index 52b3c79794..dcb561ff79 100644 --- a/drivers/net/e1000_spi.c +++ b/drivers/net/e1000_spi.c @@ -1,4 +1,5 @@ #include +#include #include #include "e1000.h" #include @@ -315,8 +316,8 @@ static int e1000_spi_eeprom_program(struct e1000_hw *hw, return 0; } -static int do_e1000_spi_show(cmd_tbl_t *cmdtp, struct e1000_hw *hw, - int argc, char * const argv[]) +static int do_e1000_spi_show(struct cmd_tbl *cmdtp, struct e1000_hw *hw, + int argc, char *const argv[]) { unsigned int length = 0; u16 i, offset = 0; @@ -384,8 +385,8 @@ static int do_e1000_spi_show(cmd_tbl_t *cmdtp, struct e1000_hw *hw, return 0; } -static int do_e1000_spi_dump(cmd_tbl_t *cmdtp, struct e1000_hw *hw, - int argc, char * const argv[]) +static int do_e1000_spi_dump(struct cmd_tbl *cmdtp, struct e1000_hw *hw, + int argc, char *const argv[]) { unsigned int length; u16 offset; @@ -429,8 +430,8 @@ static int do_e1000_spi_dump(cmd_tbl_t *cmdtp, struct e1000_hw *hw, return 0; } -static int do_e1000_spi_program(cmd_tbl_t *cmdtp, struct e1000_hw *hw, - int argc, char * const argv[]) +static int do_e1000_spi_program(struct cmd_tbl *cmdtp, struct e1000_hw *hw, + int argc, char *const argv[]) { unsigned int length; const void *source; @@ -464,8 +465,8 @@ static int do_e1000_spi_program(cmd_tbl_t *cmdtp, struct e1000_hw *hw, return 0; } -static int do_e1000_spi_checksum(cmd_tbl_t *cmdtp, struct e1000_hw *hw, - int argc, char * const argv[]) +static int do_e1000_spi_checksum(struct cmd_tbl *cmdtp, struct e1000_hw *hw, + int argc, char *const argv[]) { uint16_t i, length, checksum = 0, checksum_reg; uint16_t *buffer; @@ -540,8 +541,8 @@ static int do_e1000_spi_checksum(cmd_tbl_t *cmdtp, struct e1000_hw *hw, return 0; } -int do_e1000_spi(cmd_tbl_t *cmdtp, struct e1000_hw *hw, - int argc, char * const argv[]) +int do_e1000_spi(struct cmd_tbl *cmdtp, struct e1000_hw *hw, + int argc, char *const argv[]) { if (argc < 1) { cmd_usage(cmdtp); diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index da0815a46f..39824094f9 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -1745,7 +1745,8 @@ err: return err; } -static int do_fsl_mc(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_fsl_mc(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { int err = 0; if (argc < 3) diff --git a/drivers/net/pfe_eth/pfe_cmd.c b/drivers/net/pfe_eth/pfe_cmd.c index dd8c68d57d..bae5f8a479 100644 --- a/drivers/net/pfe_eth/pfe_cmd.c +++ b/drivers/net/pfe_eth/pfe_cmd.c @@ -9,6 +9,7 @@ * @brief PFE utility commands */ +#include #include static inline void pfe_command_help(void) @@ -16,7 +17,7 @@ static inline void pfe_command_help(void) printf("Usage: pfe [pe | status | expt ] \n"); } -static void pfe_command_pe(int argc, char * const argv[]) +static void pfe_command_pe(int argc, char *const argv[]) { if (argc >= 3 && strcmp(argv[2], "pmem") == 0) { if (argc >= 4 && strcmp(argv[3], "read") == 0) { @@ -271,7 +272,7 @@ static void bmu(int id, void *base) #define PEMBOX_ADDR_TMU 0x290 #define PESTATUS_ADDR_UTIL 0x0 -static void pfe_pe_status(int argc, char * const argv[]) +static void pfe_pe_status(int argc, char *const argv[]) { int do_clear = 0; u32 id; @@ -336,7 +337,7 @@ static void pfe_pe_status(int argc, char * const argv[]) } } -static void pfe_command_status(int argc, char * const argv[]) +static void pfe_command_status(int argc, char *const argv[]) { if (argc >= 3 && strcmp(argv[2], "pe") == 0) { pfe_pe_status(argc, argv); @@ -370,7 +371,7 @@ static const char *register_names[EXPT_REG_COUNT] = { " r12", " r13", " r14", " r15" }; -static void pfe_command_expt(int argc, char * const argv[]) +static void pfe_command_expt(int argc, char *const argv[]) { unsigned int id, i, val, addr; @@ -414,7 +415,7 @@ static void send_dummy_pkt_to_hif(void) writel(buf, TMU_PHY_INQ_PKTINFO); } -static void pfe_command_stop(int argc, char * const argv[]) +static void pfe_command_stop(int argc, char *const argv[]) { int pfe_pe_id, hif_stop_loop = 10; u32 rx_status; @@ -462,8 +463,8 @@ static void pfe_command_stop(int argc, char * const argv[]) } #endif -static int pfe_command(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int pfe_command(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { if (argc == 1 || strcmp(argv[1], "help") == 0) { pfe_command_help(); diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c index 30c4812d82..f039f895c8 100644 --- a/drivers/net/phy/b53.c +++ b/drivers/net/phy/b53.c @@ -23,6 +23,7 @@ */ #include +#include #include #include @@ -627,7 +628,7 @@ int phy_b53_init(void) return 0; } -int do_b53_reg_read(const char *name, int argc, char * const argv[]) +int do_b53_reg_read(const char *name, int argc, char *const argv[]) { u8 page, offset, width; struct mii_dev *bus; @@ -681,7 +682,7 @@ int do_b53_reg_read(const char *name, int argc, char * const argv[]) return ret; } -int do_b53_reg_write(const char *name, int argc, char * const argv[]) +int do_b53_reg_write(const char *name, int argc, char *const argv[]) { u8 page, offset, width; struct mii_dev *bus; @@ -727,7 +728,7 @@ int do_b53_reg_write(const char *name, int argc, char * const argv[]) return ret; } -int do_b53_reg(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_b53_reg(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { const char *cmd, *mdioname; int ret = 0; diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c index 6fe08b80c1..a27a9cc03e 100644 --- a/drivers/net/phy/mv88e6352.c +++ b/drivers/net/phy/mv88e6352.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include @@ -230,7 +231,7 @@ int mv88e_sw_reset(const char *devname, u8 phy_addr) return -ETIMEDOUT; } -int do_mvsw_reg_read(const char *name, int argc, char * const argv[]) +int do_mvsw_reg_read(const char *name, int argc, char *const argv[]) { u16 value = 0, phyaddr, reg, port; int ret; @@ -245,7 +246,7 @@ int do_mvsw_reg_read(const char *name, int argc, char * const argv[]) return ret; } -int do_mvsw_reg_write(const char *name, int argc, char * const argv[]) +int do_mvsw_reg_write(const char *name, int argc, char *const argv[]) { u16 value = 0, phyaddr, reg, port; int ret; @@ -261,7 +262,7 @@ int do_mvsw_reg_write(const char *name, int argc, char * const argv[]) } -int do_mvsw_reg(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_mvsw_reg(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { int ret; const char *cmd, *ethname; diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c index f17839c70f..93eb2b158c 100644 --- a/drivers/net/vsc9953.c +++ b/drivers/net/vsc9953.c @@ -5,6 +5,7 @@ * Driver for the Vitesse VSC9953 L2 Switch */ +#include #include #include #include diff --git a/drivers/power/axp152.c b/drivers/power/axp152.c index 361be6c31c..d6e36125c1 100644 --- a/drivers/power/axp152.c +++ b/drivers/power/axp152.c @@ -79,7 +79,7 @@ int axp_init(void) return 0; } -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { pmic_bus_write(AXP152_SHUTDOWN, AXP152_POWEROFF); diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c index 67b420910c..60f69ec27a 100644 --- a/drivers/power/axp209.c +++ b/drivers/power/axp209.c @@ -229,7 +229,7 @@ int axp_init(void) return 0; } -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { pmic_bus_write(AXP209_SHUTDOWN, AXP209_POWEROFF); diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c index c440047d36..3446fe7365 100644 --- a/drivers/power/axp221.c +++ b/drivers/power/axp221.c @@ -264,7 +264,7 @@ int axp_get_sid(unsigned int *sid) return 0; } -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { pmic_bus_write(AXP221_SHUTDOWN, AXP221_SHUTDOWN_POWEROFF); diff --git a/drivers/power/axp809.c b/drivers/power/axp809.c index 7de92f4f61..6323492b66 100644 --- a/drivers/power/axp809.c +++ b/drivers/power/axp809.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include @@ -219,7 +220,7 @@ int axp_init(void) return pmic_bus_init(); } -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { pmic_bus_write(AXP809_SHUTDOWN, AXP809_SHUTDOWN_POWEROFF); diff --git a/drivers/power/axp818.c b/drivers/power/axp818.c index 834919ddd4..0531707c8a 100644 --- a/drivers/power/axp818.c +++ b/drivers/power/axp818.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include @@ -255,7 +256,7 @@ int axp_init(void) return 0; } -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { pmic_bus_write(AXP818_SHUTDOWN, AXP818_SHUTDOWN_POWEROFF); diff --git a/drivers/power/mt6323.c b/drivers/power/mt6323.c index 566be5f39e..f5b27548d3 100644 --- a/drivers/power/mt6323.c +++ b/drivers/power/mt6323.c @@ -17,7 +17,7 @@ #define RTC_BBPU_KEY (0x43 << 8) #define RTC_WRTGR 0x003c -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { u32 addr, val; diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c index 095d8a51be..5a18dedada 100644 --- a/drivers/power/power_core.c +++ b/drivers/power/power_core.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include @@ -120,7 +121,8 @@ static void pmic_list_names(void) } } -static int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_pmic(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { u32 ret, reg, val; char *cmd, *name; diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c index 42c9001518..4cc261aced 100644 --- a/drivers/power/twl4030.c +++ b/drivers/power/twl4030.c @@ -22,6 +22,7 @@ * Syed Mohammed Khasim */ +#include #include /* @@ -172,7 +173,7 @@ void twl4030_power_mmc_init(int dev_index) } #ifdef CONFIG_CMD_POWEROFF -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { twl4030_power_off(); diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index fbad124b51..61ca4760c8 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -781,7 +781,7 @@ struct qe_firmware_info *qe_get_firmware_info(void) return qe_firmware_uploaded ? &qe_firmware_info : NULL; } -static int qe_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int qe_cmd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { ulong addr; diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c index 805c9ddaad..47e176b282 100644 --- a/drivers/ram/stm32mp1/stm32mp1_interactive.c +++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include @@ -150,7 +151,7 @@ static bool stm32mp1_check_step(enum stm32mp1_ddr_interact_step step, static void stm32mp1_do_info(struct ddr_info *priv, struct stm32mp1_ddr_config *config, enum stm32mp1_ddr_interact_step step, - int argc, char * const argv[]) + int argc, char *const argv[]) { unsigned long value; static char *ddr_name; @@ -223,7 +224,7 @@ static void stm32mp1_do_info(struct ddr_info *priv, } static bool stm32mp1_do_freq(struct ddr_info *priv, - int argc, char * const argv[]) + int argc, char *const argv[]) { unsigned long ddrphy_clk; @@ -246,7 +247,7 @@ static bool stm32mp1_do_freq(struct ddr_info *priv, static void stm32mp1_do_param(enum stm32mp1_ddr_interact_step step, const struct stm32mp1_ddr_config *config, - int argc, char * const argv[]) + int argc, char *const argv[]) { switch (argc) { case 1: @@ -266,7 +267,7 @@ static void stm32mp1_do_param(enum stm32mp1_ddr_interact_step step, } static void stm32mp1_do_print(struct ddr_info *priv, - int argc, char * const argv[]) + int argc, char *const argv[]) { switch (argc) { case 1: @@ -281,7 +282,7 @@ static void stm32mp1_do_print(struct ddr_info *priv, } static int stm32mp1_do_step(enum stm32mp1_ddr_interact_step step, - int argc, char * const argv[]) + int argc, char *const argv[]) { int i; unsigned long value; diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c index 51fdb1055e..9e990339a6 100644 --- a/drivers/sysreset/sysreset-uclass.c +++ b/drivers/sysreset/sysreset-uclass.c @@ -7,6 +7,7 @@ #define LOG_CATEGORY UCLASS_SYSRESET #include +#include #include #include #include @@ -111,7 +112,7 @@ void reset_cpu(ulong addr) } -int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { printf("resetting ...\n"); @@ -121,7 +122,7 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } #if IS_ENABLED(CONFIG_SYSRESET_CMD_POWEROFF) -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { int ret; diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c index 9092764e0b..39f4671fad 100644 --- a/drivers/sysreset/sysreset_mpc83xx.c +++ b/drivers/sysreset/sysreset_mpc83xx.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index fc27dbe8de..d1be3f5e13 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -9,6 +9,7 @@ * Copyright 2014 Linaro, Ltd. * Rob Herring */ +#include #include #include #include diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c index da3d63c0f0..0c4c83f89d 100644 --- a/drivers/usb/gadget/f_rockusb.c +++ b/drivers/usb/gadget/f_rockusb.c @@ -4,6 +4,7 @@ * * Eddie Cai */ +#include #include #include #include diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 5442bac4c6..8918d83723 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -65,6 +65,7 @@ */ #include +#include #include #include #include @@ -1710,7 +1711,8 @@ static void logo_black(void) 1); } -static int do_clrlogo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_clrlogo(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { if (argc != 1) return cmd_usage(cmdtp); diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c index 997e854ef8..74a2388924 100644 --- a/drivers/video/lg4573.c +++ b/drivers/video/lg4573.c @@ -6,6 +6,7 @@ */ #include #include +#include #include #include #include @@ -208,8 +209,8 @@ static int lg4573_spi_startup(struct spi_slave *slave) return 0; } -static int do_lgset(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_lgset(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { struct spi_slave *slave; struct udevice *dev; diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index 8e0fc7f3ec..dd6786ffae 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -623,7 +624,7 @@ void vidconsole_position_cursor(struct udevice *dev, unsigned col, unsigned row) priv->ycur = min_t(short, row, vid_priv->ysize - 1); } -static int do_video_setcursor(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_video_setcursor(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { unsigned int col, row; @@ -641,7 +642,7 @@ static int do_video_setcursor(cmd_tbl_t *cmdtp, int flag, int argc, return 0; } -static int do_video_puts(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_video_puts(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct udevice *dev; -- cgit v1.2.3