Merge tag 'kvm-s390-next-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm64 / include / asm / efi.h

diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h
index 4bc1e89671abb2b6e3b5d8c5c2aed1d7ac0b419e..44531a69d32b9fd1772cb131d5696decca6e08c8 100644 (file)
--- a/arch/arm64/include/asm/efi.h
+++ b/arch/arm64/include/asm/efi.h
@@ -93,12 +93,11 @@ static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base,
        return (image_addr & ~(SZ_1G - 1UL)) + (1UL << (VA_BITS_MIN - 1));
 }
 
-#define efi_call_early(f, ...)         efi_system_table()->boottime->f(__VA_ARGS__)
-#define efi_call_runtime(f, ...)       efi_system_table()->runtime->f(__VA_ARGS__)
-#define efi_is_native()                        (true)
+#define efi_bs_call(func, ...) efi_system_table()->boottime->func(__VA_ARGS__)
+#define efi_rt_call(func, ...) efi_system_table()->runtime->func(__VA_ARGS__)
+#define efi_is_native()                (true)
 
-#define efi_table_attr(table, attr, instance)                          \
-       instance->attr
+#define efi_table_attr(inst, attr)     (inst->attr)
 
 #define efi_call_proto(inst, func, ...) inst->func(inst, ##__VA_ARGS__)