diff options
-rw-r--r-- | block/partitions/efi.c | 2 | ||||
-rw-r--r-- | drivers/firmware/efi/Kconfig | 4 | ||||
-rw-r--r-- | drivers/firmware/efi/efi.c | 4 | ||||
-rw-r--r-- | drivers/firmware/efi/efivars.c | 6 | ||||
-rw-r--r-- | fs/efivarfs/super.c | 2 | ||||
-rw-r--r-- | include/linux/efi.h | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/block/partitions/efi.c b/block/partitions/efi.c index 56d08fd75b1a..26cb624ace05 100644 --- a/block/partitions/efi.c +++ b/block/partitions/efi.c | |||
@@ -715,7 +715,7 @@ int efi_partition(struct parsed_partitions *state) | |||
715 | state->parts[i + 1].flags = ADDPART_FLAG_RAID; | 715 | state->parts[i + 1].flags = ADDPART_FLAG_RAID; |
716 | 716 | ||
717 | info = &state->parts[i + 1].info; | 717 | info = &state->parts[i + 1].info; |
718 | efi_guid_unparse(&ptes[i].unique_partition_guid, info->uuid); | 718 | efi_guid_to_str(&ptes[i].unique_partition_guid, info->uuid); |
719 | 719 | ||
720 | /* Naively convert UTF16-LE to 7 bits. */ | 720 | /* Naively convert UTF16-LE to 7 bits. */ |
721 | label_max = min(ARRAY_SIZE(info->volname) - 1, | 721 | label_max = min(ARRAY_SIZE(info->volname) - 1, |
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index f712d47f30d8..8de4da5c9ab6 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig | |||
@@ -12,11 +12,11 @@ config EFI_VARS | |||
12 | 12 | ||
13 | Note that using this driver in concert with efibootmgr requires | 13 | Note that using this driver in concert with efibootmgr requires |
14 | at least test release version 0.5.0-test3 or later, which is | 14 | at least test release version 0.5.0-test3 or later, which is |
15 | available from Matt Domsch's website located at: | 15 | available from: |
16 | <http://linux.dell.com/efibootmgr/testing/efibootmgr-0.5.0-test3.tar.gz> | 16 | <http://linux.dell.com/efibootmgr/testing/efibootmgr-0.5.0-test3.tar.gz> |
17 | 17 | ||
18 | Subsequent efibootmgr releases may be found at: | 18 | Subsequent efibootmgr releases may be found at: |
19 | <http://linux.dell.com/efibootmgr> | 19 | <http://github.com/vathpela/efibootmgr> |
20 | 20 | ||
21 | config EFI_VARS_PSTORE | 21 | config EFI_VARS_PSTORE |
22 | tristate "Register efivars backend for pstore" | 22 | tristate "Register efivars backend for pstore" |
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; |
diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c index 6dad1176ec52..ddbce42548c9 100644 --- a/fs/efivarfs/super.c +++ b/fs/efivarfs/super.c | |||
@@ -140,7 +140,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor, | |||
140 | 140 | ||
141 | name[len] = '-'; | 141 | name[len] = '-'; |
142 | 142 | ||
143 | efi_guid_unparse(&entry->var.VendorGuid, name + len + 1); | 143 | efi_guid_to_str(&entry->var.VendorGuid, name + len + 1); |
144 | 144 | ||
145 | name[len + EFI_VARIABLE_GUID_LEN+1] = '\0'; | 145 | name[len + EFI_VARIABLE_GUID_LEN+1] = '\0'; |
146 | 146 | ||
diff --git a/include/linux/efi.h b/include/linux/efi.h index 0949f9c7e872..d762c81e62a8 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h | |||
@@ -844,7 +844,7 @@ efi_guidcmp (efi_guid_t left, efi_guid_t right) | |||
844 | } | 844 | } |
845 | 845 | ||
846 | static inline char * | 846 | static inline char * |
847 | efi_guid_unparse(efi_guid_t *guid, char *out) | 847 | efi_guid_to_str(efi_guid_t *guid, char *out) |
848 | { | 848 | { |
849 | sprintf(out, "%pUl", guid->b); | 849 | sprintf(out, "%pUl", guid->b); |
850 | return out; | 850 | return out; |