diff options
| author | Lukas Wunner | 2018-07-20 03:47:23 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2018-07-22 14:13:43 +0200 |
| commit | c4db9c1e8c70bc60e392da8a485bcfb035d559c2 (patch) | |
| tree | df8d0680256e4f09b5fe5b52e3bbfc9dff7f2338 /include/linux/efi.h | |
| parent | efi/x86: Add missing NULL initialization in UGA draw protocol discovery (diff) | |
| download | kernel-qcow2-linux-c4db9c1e8c70bc60e392da8a485bcfb035d559c2.tar.gz kernel-qcow2-linux-c4db9c1e8c70bc60e392da8a485bcfb035d559c2.tar.xz kernel-qcow2-linux-c4db9c1e8c70bc60e392da8a485bcfb035d559c2.zip | |
efi: Deduplicate efi_open_volume()
There's one ARM, one x86_32 and one x86_64 version of efi_open_volume()
which can be folded into a single shared version by masking their
differences with the efi_call_proto() macro introduced by commit:
3552fdf29f01 ("efi: Allow bitness-agnostic protocol calls").
To be able to dereference the device_handle attribute from the
efi_loaded_image_t table in an arch- and bitness-agnostic manner,
introduce the efi_table_attr() macro (which already exists for x86)
to arm and arm64.
No functional change intended.
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20180720014726.24031-7-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/efi.h')
| -rw-r--r-- | include/linux/efi.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index e190652f5ef9..401e4b254e30 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -894,6 +894,16 @@ typedef struct _efi_file_handle { void *flush; } efi_file_handle_t; +typedef struct { + u64 revision; + u32 open_volume; +} efi_file_io_interface_32_t; + +typedef struct { + u64 revision; + u64 open_volume; +} efi_file_io_interface_64_t; + typedef struct _efi_file_io_interface { u64 revision; int (*open_volume)(struct _efi_file_io_interface *, |