Hi Simon, On Mon, Feb 15, 2016 at 10:16 AM, Simon Glass <s...@chromium.org> wrote: > Rename three partition functions so that they start with part_. This makes > it clear what they relate to. > > Signed-off-by: Simon Glass <s...@chromium.org> > --- > > board/cm5200/fwupdate.c | 2 +- > cmd/ide.c | 6 +++--- > cmd/mmc.c | 2 +- > cmd/part.c | 8 ++++---- > cmd/read.c | 2 +- > cmd/sata.c | 6 +++--- > cmd/scsi.c | 6 +++--- > cmd/usb.c | 4 ++-- > common/fb_mmc.c | 10 +++++----- > common/spl/spl_ext.c | 6 ++---- > common/spl/spl_mmc.c | 2 +- > common/usb_storage.c | 2 +- > 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 ++-- > drivers/block/pata_bfin.c | 2 +- > drivers/block/sandbox.c | 2 +- > drivers/block/systemace.c | 2 +- > drivers/dfu/dfu_mmc.c | 2 +- > drivers/mmc/mmc.c | 2 +- > fs/fat/fat.c | 2 +- > include/part.h | 21 ++++++++++----------- > 25 files changed, 76 insertions(+), 79 deletions(-) >
[snip] > diff --git a/disk/part_amiga.c b/disk/part_amiga.c > index 0f569f0..d323b4b 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, Can we rename these two to: part_print_amiga and part_test_amiga too? > }; > diff --git a/disk/part_dos.c b/disk/part_dos.c > index 7567ed3..4a56391 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, ditto. > }; > diff --git a/disk/part_efi.c b/disk/part_efi.c > index 6f80877..eed8593 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; > @@ -957,7 +957,7 @@ static int is_pte_valid(gpt_entry * pte) > U_BOOT_PART_TYPE(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, ditto. > }; > diff --git a/disk/part_iso.c b/disk/part_iso.c > index 1d72d23..a1cf358 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, ditto. > }; > diff --git a/disk/part_mac.c b/disk/part_mac.c > index 3fb3b16..6192723 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, ditto. > }; [snip] Regards, Bin _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot