diff options
| author | Simon Glass <sjg@chromium.org> | 2020-05-10 11:39:57 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-18 17:33:33 -0400 |
| commit | 0528979fa7ab7853faaf2ecf34b7721dd4c0b383 (patch) | |
| tree | 2c2de398634b542e2457b2c3f857bd7006779d14 /common | |
| parent | 90526e9fbac47af16d70f323feae45d8d1b0f9b7 (diff) | |
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 <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/android_ab.c | 6 | ||||
| -rw-r--r-- | common/spl/spl_ext.c | 4 | ||||
| -rw-r--r-- | common/spl/spl_mmc.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/common/android_ab.c b/common/android_ab.c index e0fe32d24d..b5b8af1b27 100644 --- a/common/android_ab.c +++ b/common/android_ab.c @@ -81,7 +81,7 @@ static int ab_control_default(struct bootloader_control *abc) * @return 0 on success and a negative on error */ static int ab_control_create_from_disk(struct blk_desc *dev_desc, - const disk_partition_t *part_info, + const struct disk_partition *part_info, struct bootloader_control **abc) { ulong abc_offset, abc_blocks, ret; @@ -131,7 +131,7 @@ static int ab_control_create_from_disk(struct blk_desc *dev_desc, * @return 0 on success and a negative on error */ static int ab_control_store(struct blk_desc *dev_desc, - const disk_partition_t *part_info, + const struct disk_partition *part_info, struct bootloader_control *abc) { ulong abc_offset, abc_blocks, ret; @@ -178,7 +178,7 @@ static int ab_compare_slots(const struct slot_metadata *a, return 0; } -int ab_select_slot(struct blk_desc *dev_desc, disk_partition_t *part_info) +int ab_select_slot(struct blk_desc *dev_desc, struct disk_partition *part_info) { struct bootloader_control *abc = NULL; u32 crc32_le; diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index 2a6252229c..954133ba84 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -15,7 +15,7 @@ int spl_load_image_ext(struct spl_image_info *spl_image, s32 err; struct image_header *header; loff_t filelen, actlen; - disk_partition_t part_info = {}; + struct disk_partition part_info = {}; header = spl_get_load_buffer(-sizeof(*header), sizeof(*header)); @@ -69,7 +69,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, { int err; __maybe_unused loff_t filelen, actlen; - disk_partition_t part_info = {}; + struct disk_partition part_info = {}; __maybe_unused char *file; if (part_get_info(block_dev, partition, &part_info)) { diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index a68cdec8dc..fcdd3caeac 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -168,7 +168,7 @@ static int mmc_load_image_raw_partition(struct spl_image_info *spl_image, struct mmc *mmc, int partition, unsigned long sector) { - disk_partition_t info; + struct disk_partition info; int err; #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE |