summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Fatoum <ahmad@a3f.at>2019-10-16 09:21:36 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-10-18 13:56:31 +0200
commitedf901bf6b0a0f2bd2d9d1ec9ec366140aa24489 (patch)
tree2096aca766c4d51bf9ce0aeffdfc6de0e7d1cf3d
parent7999733764b18ff74471255bc780c2f913d8fb73 (diff)
downloadbarebox-edf901bf6b0a0f2bd2d9d1ec9ec366140aa24489.tar.gz
efi: retire efi_compare_guid in favor of efi_guidcmp
Both functions wrap the same memcmp except that one uses pointers to GUIDs and the other passes the GUIDs by value. The function is static inline, so it doesn't really matter which one we keep. We'll drop efi_compare_guid because it's been used once only in the code base so far. Signed-off-by: Ahmad Fatoum <ahmad@a3f.at> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--common/efi-devicepath.c2
-rw-r--r--include/efi.h5
2 files changed, 1 insertions, 6 deletions
diff --git a/common/efi-devicepath.c b/common/efi-devicepath.c
index 2472228..3db2cea 100644
--- a/common/efi-devicepath.c
+++ b/common/efi-devicepath.c
@@ -572,7 +572,7 @@ dev_path_vendor(struct string *str, void *dev_path)
}
cprintf(str, "Ven%s(%pU", type, &Vendor->Guid);
- if (efi_compare_guid(&Vendor->Guid, &efi_unknown_device_guid) == 0) {
+ if (efi_guidcmp(Vendor->Guid, efi_unknown_device_guid) == 0) {
/* GUID used by EFI to enumerate an EDD 1.1 device */
unknown_dev_path =
(struct unknown_device_vendor_device_path *) Vendor;
diff --git a/include/efi.h b/include/efi.h
index 218333f..166803a 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -664,11 +664,6 @@ typedef union {
efi_ipv6_address v6;
} efi_ip_address;
-static inline int efi_compare_guid(efi_guid_t *a, efi_guid_t *b)
-{
- return memcmp(a, b, sizeof(efi_guid_t));
-}
-
struct efi_device_path *device_path_from_handle(efi_handle_t Handle);
char *device_path_to_str(struct efi_device_path *dev_path);
u8 device_path_to_type(struct efi_device_path *dev_path);