On Sun, 1 Dec 2019 at 22:11, Arvind Sankar <nivedita@xxxxxxxxxxxx> wrote:
>
> The unload field is a function pointer, so it should be u32 for 32-bit,
> u64 for 64-bit. Add a prototype for it in the native efi_loaded_image_t
> type. Also change type of parent_handle and device_handle from void* to
> efi_handle_t for documentation purposes.
>
> The unload method is not used, so no functional change.
Please resend this patch with a signed-off-by line, and I will queue
it for the next merge window.
> ---
> include/linux/efi.h | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/include/linux/efi.h b/include/linux/efi.h
> index 99dfea595c8c..aa54586db7a5 100644
> --- a/include/linux/efi.h
> +++ b/include/linux/efi.h
> @@ -824,7 +824,7 @@ typedef struct {
> __aligned_u64 image_size;
> unsigned int image_code_type;
> unsigned int image_data_type;
> - unsigned long unload;
> + u32 unload;
> } efi_loaded_image_32_t;
>
> typedef struct {
> @@ -840,14 +840,14 @@ typedef struct {
> __aligned_u64 image_size;
> unsigned int image_code_type;
> unsigned int image_data_type;
> - unsigned long unload;
> + u64 unload;
> } efi_loaded_image_64_t;
>
> typedef struct {
> u32 revision;
> - void *parent_handle;
> + efi_handle_t parent_handle;
> efi_system_table_t *system_table;
> - void *device_handle;
> + efi_handle_t device_handle;
> void *file_path;
> void *reserved;
> u32 load_options_size;
> @@ -856,7 +856,7 @@ typedef struct {
> __aligned_u64 image_size;
> unsigned int image_code_type;
> unsigned int image_data_type;
> - unsigned long unload;
> + efi_status_t (*unload)(efi_handle_t image_handle);
> } efi_loaded_image_t;
>
>
> --
> 2.23.0
>
