commit 9530652ad328812bca8a66896a51905601d397ca
author Heinrich Schuchardt <xypron.glpk@gmx.de> Fri Oct 15 02:03:55 2021 +0200
committer Heinrich Schuchardt <xypron.glpk@gmx.de> Thu Oct 21 03:46:04 2021 +0200
tree f5f6112625fd86ac4e795dfdf8561177ef5c1e82
parent ca44a5d02f65525a0db9ba4ae04e7e88b9fe913c

efi_loader: efi_dp_from_lo() unused parameter size

Parameter size is never used in function efi_dp_from_lo(). Remove it.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

cmd/efidebug.c

diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index 70a4658..33a5135 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -1144,7 +1144,6 @@
 	struct efi_device_path *initrd_path = NULL;
 	struct efi_load_option lo;
 	efi_status_t ret;
-	efi_uintn_t initrd_dp_size;
 	const efi_guid_t lf2_initrd_guid = EFI_INITRD_MEDIA_GUID;
 
 	ret = efi_deserialize_load_option(&lo, data, size);
@@ -1166,7 +1165,7 @@
 
 	printf("  file_path: %pD\n", lo.file_path);
 
-	initrd_path = efi_dp_from_lo(&lo, &initrd_dp_size, &lf2_initrd_guid);
+	initrd_path = efi_dp_from_lo(&lo, &lf2_initrd_guid);
 	if (initrd_path) {
 		printf("  initrd_path: %pD\n", initrd_path);
 		efi_free_pool(initrd_path);

include/efi_loader.h

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 6e806f9..3e5ac38 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -842,7 +842,6 @@
 };
 
 struct efi_device_path *efi_dp_from_lo(struct efi_load_option *lo,
-				       efi_uintn_t *size,
 				       const efi_guid_t *guid);
 struct efi_device_path *efi_dp_concat(const struct efi_device_path *dp1,
 				      const struct efi_device_path *dp2);

lib/efi_loader/efi_device_path.c

diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index a588712..58fff81 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -1209,7 +1209,6 @@
  *                    initrd location
  *
  * @lo:		EFI_LOAD_OPTION containing a valid device path
- * @size:	size of the discovered device path
  * @guid:	guid to search for
  *
  * Return:
@@ -1218,7 +1217,6 @@
  */
 struct
 efi_device_path *efi_dp_from_lo(struct efi_load_option *lo,
-				efi_uintn_t *size,
 				const efi_guid_t *guid)
 {
 	struct efi_device_path *fp = lo->file_path;

lib/efi_loader/efi_helper.c

diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c
index 4c5b7cd..89833de 100644
--- a/lib/efi_loader/efi_helper.c
+++ b/lib/efi_loader/efi_helper.c
@@ -83,7 +83,7 @@
 	if (ret != EFI_SUCCESS)
 		goto out;
 
-	tmp = efi_dp_from_lo(&lo, &size, &guid);
+	tmp = efi_dp_from_lo(&lo, &guid);
 	if (!tmp)
 		goto out;