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>

diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index 70a4658012963ddb09703032373c20b7e68c75a7..33a5135ee19f78b32e34bfc1e8bc39fe7f3bc8ac 100644 (file)
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -1144,7 +1144,6 @@ static void show_efi_boot_opt_data(u16 *varname16, void *data, size_t *size)
        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 @@ static void show_efi_boot_opt_data(u16 *varname16, void *data, size_t *size)
 
        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);

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 6e806f9b0db59c2eb6bc45db26fbdc51809554a9..3e5ac3804249b859449e4f428b112cadef48aae1 100644 (file)
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -842,7 +842,6 @@ struct efi_load_option {
 };
 
 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);

diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index a588712ef14c1212e81df379941f35ef854c2de4..58fff81a2d212c6e18bbb65b60b2e3e5223278d1 100644 (file)
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -1209,7 +1209,6 @@ ssize_t efi_dp_check_length(const struct efi_device_path *dp,
  *                    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 @@ ssize_t efi_dp_check_length(const struct efi_device_path *dp,
  */
 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;

diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c
index 4c5b7cd2e128e41ae9cab95d5e86d5384f8498da..89833de222852bb9d9037ae482981fc1704fde70 100644 (file)
--- a/lib/efi_loader/efi_helper.c
+++ b/lib/efi_loader/efi_helper.c
@@ -83,7 +83,7 @@ struct efi_device_path *efi_get_dp_from_boot(const efi_guid_t guid)
        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;