diff options
author | Borislav Petkov <bp@suse.de> | 2014-12-18 10:02:17 -0500 |
---|---|---|
committer | Ricardo Neri <ricardo.neri-calderon@linux.intel.com> | 2015-01-07 22:07:44 -0500 |
commit | 26e022727f5e88c6e5054e14d954425deacbe56a (patch) | |
tree | b57dfabd52def943ad99e0c0b1a34c3cdca58971 /drivers/firmware/efi | |
parent | 0e4ca02b3fc0e33e96eef1f4da227eab2c67b8ac (diff) |
efi: Rename efi_guid_unparse to efi_guid_to_str
Call it what it does - "unparse" is plain-misleading.
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Diffstat (limited to 'drivers/firmware/efi')
-rw-r--r-- | drivers/firmware/efi/efi.c | 4 | ||||
-rw-r--r-- | drivers/firmware/efi/efivars.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 8590099ac148..ff0bbe383b31 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c | |||
@@ -272,10 +272,10 @@ static __init int match_config_table(efi_guid_t *guid, | |||
272 | int i; | 272 | int i; |
273 | 273 | ||
274 | if (table_types) { | 274 | if (table_types) { |
275 | efi_guid_unparse(guid, str); | 275 | efi_guid_to_str(guid, str); |
276 | 276 | ||
277 | for (i = 0; efi_guidcmp(table_types[i].guid, NULL_GUID); i++) { | 277 | for (i = 0; efi_guidcmp(table_types[i].guid, NULL_GUID); i++) { |
278 | efi_guid_unparse(&table_types[i].guid, str); | 278 | efi_guid_to_str(&table_types[i].guid, str); |
279 | 279 | ||
280 | if (!efi_guidcmp(*guid, table_types[i].guid)) { | 280 | if (!efi_guidcmp(*guid, table_types[i].guid)) { |
281 | *(table_types[i].ptr) = table; | 281 | *(table_types[i].ptr) = table; |
diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c index f256ecd8a176..7b2e0496e0c0 100644 --- a/drivers/firmware/efi/efivars.c +++ b/drivers/firmware/efi/efivars.c | |||
@@ -39,7 +39,7 @@ | |||
39 | * fix locking per Peter Chubb's findings | 39 | * fix locking per Peter Chubb's findings |
40 | * | 40 | * |
41 | * 25 Mar 2002 - Matt Domsch <Matt_Domsch@dell.com> | 41 | * 25 Mar 2002 - Matt Domsch <Matt_Domsch@dell.com> |
42 | * move uuid_unparse() to include/asm-ia64/efi.h:efi_guid_unparse() | 42 | * move uuid_unparse() to include/asm-ia64/efi.h:efi_guid_to_str() |
43 | * | 43 | * |
44 | * 12 Feb 2002 - Matt Domsch <Matt_Domsch@dell.com> | 44 | * 12 Feb 2002 - Matt Domsch <Matt_Domsch@dell.com> |
45 | * use list_for_each_safe when deleting vars. | 45 | * use list_for_each_safe when deleting vars. |
@@ -128,7 +128,7 @@ efivar_guid_read(struct efivar_entry *entry, char *buf) | |||
128 | if (!entry || !buf) | 128 | if (!entry || !buf) |
129 | return 0; | 129 | return 0; |
130 | 130 | ||
131 | efi_guid_unparse(&var->VendorGuid, str); | 131 | efi_guid_to_str(&var->VendorGuid, str); |
132 | str += strlen(str); | 132 | str += strlen(str); |
133 | str += sprintf(str, "\n"); | 133 | str += sprintf(str, "\n"); |
134 | 134 | ||
@@ -569,7 +569,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var) | |||
569 | private variables from another's. */ | 569 | private variables from another's. */ |
570 | 570 | ||
571 | *(short_name + strlen(short_name)) = '-'; | 571 | *(short_name + strlen(short_name)) = '-'; |
572 | efi_guid_unparse(&new_var->var.VendorGuid, | 572 | efi_guid_to_str(&new_var->var.VendorGuid, |
573 | short_name + strlen(short_name)); | 573 | short_name + strlen(short_name)); |
574 | 574 | ||
575 | new_var->kobj.kset = efivars_kset; | 575 | new_var->kobj.kset = efivars_kset; |