efi/libstub: Drop 'table' argument from efi_table_attr() macro

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

diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h
index 7667826b93f12d6cde2e151b6fa17372a1d1c3a6..bc720024a2603f2579d544cd7c7adef74ac61d68 100644 (file)
--- a/arch/arm/include/asm/efi.h
+++ b/arch/arm/include/asm/efi.h
@@ -50,19 +50,16 @@ void efi_virtmap_unload(void);
 
 /* arch specific definitions used by the stub code */
 
-#define efi_call_early(f, ...)         sys_table_arg->boottime->f(__VA_ARGS__)
-#define __efi_call_early(f, ...)       f(__VA_ARGS__)
-#define efi_call_runtime(f, ...)       sys_table_arg->runtime->f(__VA_ARGS__)
-#define efi_is_64bit()                 (false)
+#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_table_attr(table, attr, instance)                          \
-       ((table##_t *)instance)->attr
+#define efi_table_attr(inst, attr)     (inst->attr)
 
-#define efi_call_proto(protocol, f, instance, ...)                     \
-       ((protocol##_t *)instance)->f(instance, ##__VA_ARGS__)
+#define efi_call_proto(inst, func, ...) inst->func(inst, ##__VA_ARGS__)
 
-struct screen_info *alloc_screen_info(efi_system_table_t *sys_table_arg);
-void free_screen_info(efi_system_table_t *sys_table, struct screen_info *si);
+struct screen_info *alloc_screen_info(void);
+void free_screen_info(struct screen_info *si);
 
 static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt)
 {