summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/efi.h
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2019-12-24 16:10:21 +0100
committerIngo Molnar <mingo@kernel.org>2019-12-25 10:49:24 +0100
commit47c0fd39b7b81f51cc8f767c34a57d12289bdc60 (patch)
tree6df49008221920b33cf91c53f07382a88cc97c5d /arch/x86/include/asm/efi.h
parentefi/libstub/x86: Work around page freeing issue in mixed mode (diff)
downloadlinux-47c0fd39b7b81f51cc8f767c34a57d12289bdc60.tar.xz
linux-47c0fd39b7b81f51cc8f767c34a57d12289bdc60.zip
efi/libstub: Drop protocol argument from efi_call_proto() macro
After refactoring the mixed mode support code, efi_call_proto() no longer uses its protocol argument in any of its implementation, so let's remove it altogether. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Cc: Arvind Sankar <nivedita@alum.mit.edu> Cc: Borislav Petkov <bp@alien8.de> Cc: James Morse <james.morse@arm.com> Cc: Matt Fleming <matt@codeblueprint.co.uk> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-efi@vger.kernel.org Link: https://lkml.kernel.org/r/20191224151025.32482-22-ardb@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/efi.h')
-rw-r--r--arch/x86/include/asm/efi.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 1817f350618e..b7cd14e3a634 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -227,10 +227,10 @@ static inline bool efi_is_native(void)
__ret; \
})
-#define efi_call_proto(protocol, f, instance, ...) \
+#define efi_call_proto(inst, func, ...) \
(efi_is_native() \
- ? instance->f(instance, ##__VA_ARGS__) \
- : efi64_thunk(instance->mixed_mode.f, instance, ##__VA_ARGS__))
+ ? inst->func(inst, ##__VA_ARGS__) \
+ : efi64_thunk(inst->mixed_mode.func, inst, ##__VA_ARGS__))
#define efi_call_early(f, ...) \
(efi_is_native() \