From 3e8bd469504f5d5a8800a2ea46d664dde701105b Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 29 Feb 2016 15:25:48 -0700 Subject: dm: part: Rename some partition functions Rename three partition functions so that they start with part_. This makes it clear what they relate to. Signed-off-by: Simon Glass Tested-by: Stephen Warren --- disk/part.c | 12 ++++++------ disk/part_amiga.c | 4 ++-- disk/part_dos.c | 19 +++++++++---------- disk/part_efi.c | 10 +++++----- disk/part_iso.c | 17 +++++++++-------- disk/part_mac.c | 4 ++-- 6 files changed, 33 insertions(+), 33 deletions(-) (limited to 'disk') diff --git a/disk/part.c b/disk/part.c index 978b85c6eb..9a78cceadb 100644 --- a/disk/part.c +++ b/disk/part.c @@ -267,7 +267,7 @@ void dev_print (struct blk_desc *dev_desc) #ifdef HAVE_BLOCK_DEVICE -void init_part(struct blk_desc *dev_desc) +void part_init(struct blk_desc *dev_desc) { struct part_driver *drv = ll_entry_start(struct part_driver, part_driver); @@ -329,7 +329,7 @@ static void print_part_header(const char *type, struct blk_desc *dev_desc) #endif /* any CONFIG_..._PARTITION */ } -void print_part(struct blk_desc *dev_desc) +void part_print(struct blk_desc *dev_desc) { struct part_driver *drv; @@ -348,7 +348,7 @@ void print_part(struct blk_desc *dev_desc) #endif /* HAVE_BLOCK_DEVICE */ -int get_partition_info(struct blk_desc *dev_desc, int part, +int part_get_info(struct blk_desc *dev_desc, int part, disk_partition_t *info) { #ifdef HAVE_BLOCK_DEVICE @@ -432,7 +432,7 @@ int blk_get_device_by_str(const char *ifname, const char *dev_hwpart_str, * already loaded. */ if(hwpart != 0) - init_part(*dev_desc); + part_init(*dev_desc); #endif cleanup: @@ -607,7 +607,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, * other than "auto", use that partition number directly. */ if (part != PART_AUTO) { - ret = get_partition_info(*dev_desc, part, info); + ret = part_get_info(*dev_desc, part, info); if (ret) { printf("** Invalid partition %d **\n", part); goto cleanup; @@ -619,7 +619,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, */ part = 0; for (p = 1; p <= MAX_SEARCH_PARTITIONS; p++) { - ret = get_partition_info(*dev_desc, p, info); + ret = part_get_info(*dev_desc, p, info); if (ret) continue; diff --git a/disk/part_amiga.c b/disk/part_amiga.c index 0f569f0c9b..d323b4bc1e 100644 --- a/disk/part_amiga.c +++ b/disk/part_amiga.c @@ -291,7 +291,7 @@ static struct partition_block *find_partition(struct blk_desc *dev_desc, /* * Get info about a partition */ -static int get_partition_info_amiga(struct blk_desc *dev_desc, int part, +static int part_get_info_amiga(struct blk_desc *dev_desc, int part, disk_partition_t *info) { struct partition_block *p = find_partition(dev_desc, part-1); @@ -382,7 +382,7 @@ static void print_part_amiga(struct blk_desc *dev_desc) U_BOOT_PART_TYPE(amiga) = { .name = "AMIGA", .part_type = PART_TYPE_AMIGA, - .get_info = get_partition_info_amiga, + .get_info = part_get_info_amiga, .print = print_part_amiga, .test = test_part_amiga, }; diff --git a/disk/part_dos.c b/disk/part_dos.c index 7567ed3b29..4a56391de7 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -167,11 +167,10 @@ static void print_partition_extended(struct blk_desc *dev_desc, /* Print a partition that is relative to its Extended partition table */ -static int get_partition_info_extended(struct blk_desc *dev_desc, - lbaint_t ext_part_sector, - lbaint_t relative, int part_num, - int which_part, disk_partition_t *info, - unsigned int disksig) +static int part_get_info_extended(struct blk_desc *dev_desc, + lbaint_t ext_part_sector, lbaint_t relative, + int part_num, int which_part, + disk_partition_t *info, unsigned int disksig) { ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz); dos_partition_t *pt; @@ -259,7 +258,7 @@ static int get_partition_info_extended(struct blk_desc *dev_desc, lbaint_t lba_start = le32_to_int (pt->start4) + relative; - return get_partition_info_extended (dev_desc, lba_start, + return part_get_info_extended(dev_desc, lba_start, ext_part_sector == 0 ? lba_start : relative, part_num, which_part, info, disksig); } @@ -289,16 +288,16 @@ void print_part_dos(struct blk_desc *dev_desc) print_partition_extended(dev_desc, 0, 0, 1, 0); } -int get_partition_info_dos(struct blk_desc *dev_desc, int part, - disk_partition_t *info) +int part_get_info_dos(struct blk_desc *dev_desc, int part, + disk_partition_t *info) { - return get_partition_info_extended(dev_desc, 0, 0, 1, part, info, 0); + return part_get_info_extended(dev_desc, 0, 0, 1, part, info, 0); } U_BOOT_PART_TYPE(dos) = { .name = "DOS", .part_type = PART_TYPE_DOS, - .get_info = part_get_info_ptr(get_partition_info_dos), + .get_info = part_get_info_ptr(part_get_info_dos), .print = part_print_ptr(print_part_dos), .test = test_part_dos, }; diff --git a/disk/part_efi.c b/disk/part_efi.c index 3471b755e1..209a671d3e 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -237,8 +237,8 @@ void print_part_efi(struct blk_desc *dev_desc) return; } -int get_partition_info_efi(struct blk_desc *dev_desc, int part, - disk_partition_t *info) +int part_get_info_efi(struct blk_desc *dev_desc, int part, + disk_partition_t *info) { ALLOC_CACHE_ALIGN_BUFFER_PAD(gpt_header, gpt_head, 1, dev_desc->blksz); gpt_entry *gpt_pte = NULL; @@ -300,13 +300,13 @@ int get_partition_info_efi(struct blk_desc *dev_desc, int part, return 0; } -int get_partition_info_efi_by_name(struct blk_desc *dev_desc, +int part_get_info_efi_by_name(struct blk_desc *dev_desc, const char *name, disk_partition_t *info) { int ret; int i; for (i = 1; i < GPT_ENTRY_NUMBERS; i++) { - ret = get_partition_info_efi(dev_desc, i, info); + ret = part_get_info_efi(dev_desc, i, info); if (ret != 0) { /* no more entries in table */ return -1; @@ -962,7 +962,7 @@ static int is_pte_valid(gpt_entry * pte) U_BOOT_PART_TYPE(a_efi) = { .name = "EFI", .part_type = PART_TYPE_EFI, - .get_info = part_get_info_ptr(get_partition_info_efi), + .get_info = part_get_info_ptr(part_get_info_efi), .print = part_print_ptr(print_part_efi), .test = test_part_efi, }; diff --git a/disk/part_iso.c b/disk/part_iso.c index 1d72d236ce..a1cf358388 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -46,8 +46,8 @@ static inline unsigned short le16_to_int(unsigned char *le16) /* only boot records will be listed as valid partitions */ -int get_partition_info_iso_verb(struct blk_desc *dev_desc, int part_num, - disk_partition_t *info, int verb) +int part_get_info_iso_verb(struct blk_desc *dev_desc, int part_num, + disk_partition_t *info, int verb) { int i,offset,entry_num; unsigned short *chksumbuf; @@ -217,17 +217,18 @@ found: return 0; } -static int get_partition_info_iso(struct blk_desc *dev_desc, int part_num, +static int part_get_info_iso(struct blk_desc *dev_desc, int part_num, disk_partition_t *info) { - return(get_partition_info_iso_verb(dev_desc, part_num, info, 1)); + return part_get_info_iso_verb(dev_desc, part_num, info, 1); } static void print_part_iso(struct blk_desc *dev_desc) { disk_partition_t info; int i; - if(get_partition_info_iso_verb(dev_desc,0,&info,0)==-1) { + + if (part_get_info_iso_verb(dev_desc, 0, &info, 0) == -1) { printf("** No boot partition found on device %d **\n",dev_desc->dev); return; } @@ -237,20 +238,20 @@ static void print_part_iso(struct blk_desc *dev_desc) printf(" %2d " LBAFU " " LBAFU " %6ld %.32s\n", i, info.start, info.size, info.blksz, info.type); i++; - } while (get_partition_info_iso_verb(dev_desc,i,&info,0)!=-1); + } while (part_get_info_iso_verb(dev_desc, i, &info, 0) != -1); } static int test_part_iso(struct blk_desc *dev_desc) { disk_partition_t info; - return(get_partition_info_iso_verb(dev_desc,0,&info,0)); + return part_get_info_iso_verb(dev_desc, 0, &info, 0); } U_BOOT_PART_TYPE(iso) = { .name = "ISO", .part_type = PART_TYPE_ISO, - .get_info = get_partition_info_iso, + .get_info = part_get_info_iso, .print = print_part_iso, .test = test_part_iso, }; diff --git a/disk/part_mac.c b/disk/part_mac.c index 3fb3b161ae..61927234fb 100644 --- a/disk/part_mac.c +++ b/disk/part_mac.c @@ -213,7 +213,7 @@ static int part_mac_read_pdb(struct blk_desc *dev_desc, int part, /* NOTREACHED */ } -static int get_partition_info_mac(struct blk_desc *dev_desc, int part, +static int part_get_info_mac(struct blk_desc *dev_desc, int part, disk_partition_t *info) { ALLOC_CACHE_ALIGN_BUFFER(mac_driver_desc_t, ddesc, 1); @@ -240,7 +240,7 @@ static int get_partition_info_mac(struct blk_desc *dev_desc, int part, U_BOOT_PART_TYPE(mac) = { .name = "MAC", .part_type = PART_TYPE_MAC, - .get_info = get_partition_info_mac, + .get_info = part_get_info_mac, .print = print_part_mac, .test = test_part_mac, }; -- cgit v1.2.1