summaryrefslogtreecommitdiff
path: root/disk
diff options
context:
space:
mode:
authorDoug Anderson <dianders@chromium.org>2011-10-18 17:14:22 -0700
committerDoug Anderson <dianders@chromium.org>2011-10-19 11:46:29 -0700
commite95fc9085490220ce9f1392b2b1962b11ba887e1 (patch)
tree3609bca2e07c2a3a619e6d42a25c5c98631edb0c /disk
parentf4aaeddf25c810eab57d4c13b2f44b9a2abfb673 (diff)
CHROMIUM: cosmetic: Replace __FUNCTION__ with __func__
This makes checkpatch happy. BUG=None TEST=Compiles; function name prints OK in debug messages. Change-Id: I0158653c5be216ddf0094d0e42d61918484f946b Signed-off-by: Doug Anderson <dianders@chromium.org> Reviewed-on: http://gerrit.chromium.org/gerrit/10270 Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'disk')
-rw-r--r--disk/part_efi.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/disk/part_efi.c b/disk/part_efi.c
index 3a58994299..d435e68f98 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -114,22 +114,22 @@ void print_part_efi(block_dev_desc_t * dev_desc)
int i = 0;
if (gpt_head == NULL) {
- printf("%s: gpt_header allocation failed\n", __FUNCTION__);
+ printf("%s: gpt_header allocation failed\n", __func__);
return;
}
if (!dev_desc) {
- printf("%s: Invalid Argument(s)\n", __FUNCTION__);
+ printf("%s: Invalid Argument(s)\n", __func__);
goto failure;
}
/* This function validates AND fills in the GPT header and PTE */
if (is_gpt_valid(dev_desc, GPT_PRIMARY_PARTITION_TABLE_LBA,
gpt_head, pgpt_pte) != 1) {
- printf("%s: *** ERROR: Invalid GPT ***\n", __FUNCTION__);
+ printf("%s: *** ERROR: Invalid GPT ***\n", __func__);
goto failure;
}
- debug("%s: gpt-entry at 0x%08X\n", __FUNCTION__, (unsigned int)*pgpt_pte);
+ debug("%s: gpt-entry at 0x%08X\n", __func__, (unsigned int)*pgpt_pte);
printf("Part Start LBA End LBA\n");
for (i = 0; i < le32_to_int(gpt_head->num_partition_entries); i++) {
@@ -146,7 +146,7 @@ void print_part_efi(block_dev_desc_t * dev_desc)
/* Remember to free pte */
if (*pgpt_pte != NULL) {
- debug("%s: Freeing pgpt_pte\n", __FUNCTION__);
+ debug("%s: Freeing pgpt_pte\n", __func__);
free(*pgpt_pte);
}
@@ -164,13 +164,13 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part,
int err = 0;
if (gpt_head == NULL) {
- printf("%s: gpt_header allocation failed\n", __FUNCTION__);
+ printf("%s: gpt_header allocation failed\n", __func__);
return -1;
}
/* "part" argument must be at least 1 */
if (!dev_desc || !info || part < 1) {
- printf("%s: Invalid Argument(s)\n", __FUNCTION__);
+ printf("%s: Invalid Argument(s)\n", __func__);
err = -1;
goto failure;
}
@@ -178,7 +178,7 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part,
/* This function validates AND fills in the GPT header and PTE */
if (is_gpt_valid(dev_desc, GPT_PRIMARY_PARTITION_TABLE_LBA,
gpt_head, pgpt_pte) != 1) {
- printf("%s: *** ERROR: Invalid GPT ***\n", __FUNCTION__);
+ printf("%s: *** ERROR: Invalid GPT ***\n", __func__);
err = -1;
goto failure;
}
@@ -193,12 +193,12 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part,
sprintf((char *)info->name, "%s%d", GPT_ENTRY_NAME, part);
sprintf((char *)info->type, "U-Boot");
- debug("%s: start 0x%lX, size 0x%lX, name %s", __FUNCTION__,
+ debug("%s: start 0x%lX, size 0x%lX, name %s", __func__,
info->start, info->size, info->name);
/* Remember to free pte */
if (*pgpt_pte != NULL) {
- debug("%s: Freeing pgpt_pte\n", __FUNCTION__);
+ debug("%s: Freeing pgpt_pte\n", __func__);
free(*pgpt_pte);
}
@@ -214,7 +214,7 @@ int test_part_efi(block_dev_desc_t * dev_desc)
int err = 0;
if (legacymbr == NULL) {
- printf("%s: legacy_mbr allocation failed\n", __FUNCTION__);
+ printf("%s: legacy_mbr allocation failed\n", __func__);
return -1;
}
@@ -291,7 +291,7 @@ static int is_gpt_valid(block_dev_desc_t * dev_desc, unsigned long long lba,
unsigned long long lastlba;
if (!dev_desc || !pgpt_head) {
- printf("%s: Invalid Argument(s)\n", __FUNCTION__);
+ printf("%s: Invalid Argument(s)\n", __func__);
return 0;
}
@@ -395,14 +395,14 @@ static gpt_entry *alloc_read_gpt_entries(block_dev_desc_t * dev_desc,
gpt_entry *pte = NULL;
if (!dev_desc || !pgpt_head) {
- printf("%s: Invalid Argument(s)\n", __FUNCTION__);
+ printf("%s: Invalid Argument(s)\n", __func__);
return NULL;
}
count = le32_to_int(pgpt_head->num_partition_entries) *
le32_to_int(pgpt_head->sizeof_partition_entry);
- debug("%s: count = %lu * %lu = %u\n", __FUNCTION__,
+ debug("%s: count = %lu * %lu = %u\n", __func__,
le32_to_int(pgpt_head->num_partition_entries),
le32_to_int(pgpt_head->sizeof_partition_entry), count);
@@ -413,7 +413,7 @@ static gpt_entry *alloc_read_gpt_entries(block_dev_desc_t * dev_desc,
if (count == 0 || pte == NULL) {
printf("%s: ERROR: Can't allocate 0x%X bytes for GPT Entries\n",
- __FUNCTION__, count);
+ __func__, count);
return NULL;
}
@@ -441,7 +441,7 @@ static int is_pte_valid(gpt_entry * pte)
efi_guid_t unused_guid;
if (!pte) {
- printf("%s: Invalid Argument(s)\n", __FUNCTION__);
+ printf("%s: Invalid Argument(s)\n", __func__);
return 0;
}
@@ -453,7 +453,7 @@ static int is_pte_valid(gpt_entry * pte)
if (memcmp(pte->partition_type_guid.b, unused_guid.b,
sizeof(unused_guid.b)) == 0) {
- debug("%s: Found an unused PTE GUID at 0x%08X\n", __FUNCTION__,
+ debug("%s: Found an unused PTE GUID at 0x%08X\n", __func__,
(unsigned int)pte);
return 0;