From 0528979fa7ab7853faaf2ecf34b7721dd4c0b383 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:57 -0600 Subject: part: Drop disk_partition_t typedef We should not be using typedefs and these make it harder to use forward declarations (to reduce header file inclusions). Drop the typedef. Signed-off-by: Simon Glass --- drivers/dfu/dfu_mmc.c | 2 +- drivers/fastboot/fb_getvar.c | 4 ++-- drivers/fastboot/fb_mmc.c | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'drivers') diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index 0d495a785b..cddca0c45f 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -369,7 +369,7 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s) simple_strtoul(s, NULL, 0); } else if (!strcmp(entity_type, "part")) { - disk_partition_t partinfo; + struct disk_partition partinfo; struct blk_desc *blk_dev = mmc_get_blk_desc(mmc); int mmcdev = second_arg; int mmcpart = third_arg; diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 95cb434189..467a8618fe 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -103,7 +103,7 @@ static int getvar_get_part_info(const char *part_name, char *response, int r; # if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC) struct blk_desc *dev_desc; - disk_partition_t part_info; + struct disk_partition part_info; r = fastboot_mmc_get_part_info(part_name, &dev_desc, &part_info, response); @@ -219,7 +219,7 @@ static void getvar_partition_type(char *part_name, char *response) { int r; struct blk_desc *dev_desc; - disk_partition_t part_info; + struct disk_partition part_info; r = fastboot_mmc_get_part_info(part_name, &dev_desc, &part_info, response); diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index d3249a54f7..c666eb0f29 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -27,7 +27,7 @@ struct fb_mmc_sparse { }; static int part_get_info_by_name_or_alias(struct blk_desc *dev_desc, - const char *name, disk_partition_t *info) + const char *name, struct disk_partition *info) { int ret; @@ -98,9 +98,9 @@ static lbaint_t fb_mmc_sparse_reserve(struct sparse_storage *info, return blkcnt; } -static void write_raw_image(struct blk_desc *dev_desc, disk_partition_t *info, - const char *part_name, void *buffer, - u32 download_bytes, char *response) +static void write_raw_image(struct blk_desc *dev_desc, + struct disk_partition *info, const char *part_name, + void *buffer, u32 download_bytes, char *response) { lbaint_t blkcnt; lbaint_t blks; @@ -211,7 +211,7 @@ static void fb_mmc_boot1_ops(struct blk_desc *dev_desc, void *buffer, * @return Boot image header sectors count or 0 on error */ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc, - disk_partition_t *info, + struct disk_partition *info, struct andr_img_hdr *hdr, char *response) { @@ -271,7 +271,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, u32 kernel_sector_start; u32 kernel_sectors; u32 sectors_per_page; - disk_partition_t info; + struct disk_partition info; int res; puts("Flashing zImage\n"); @@ -367,12 +367,12 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, * * @part_name: Named partition to lookup * @dev_desc: Pointer to returned blk_desc pointer - * @part_info: Pointer to returned disk_partition_t + * @part_info: Pointer to returned struct disk_partition * @response: Pointer to fastboot response buffer */ int fastboot_mmc_get_part_info(const char *part_name, struct blk_desc **dev_desc, - disk_partition_t *part_info, char *response) + struct disk_partition *part_info, char *response) { int r; @@ -407,7 +407,7 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer, u32 download_bytes, char *response) { struct blk_desc *dev_desc; - disk_partition_t info; + struct disk_partition info; dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV); if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) { @@ -524,7 +524,7 @@ void fastboot_mmc_erase(const char *cmd, char *response) { int ret; struct blk_desc *dev_desc; - disk_partition_t info; + struct disk_partition info; lbaint_t blks, blks_start, blks_size, grp_size; struct mmc *mmc = find_mmc_device(CONFIG_FASTBOOT_FLASH_MMC_DEV); -- cgit v1.2.3