[PATCH v2] ARM: efi: Simplify arch_efi_call_virt() macro

[Sudeep Holla]

Currently, the arch_efi_call_virt() assumes all users of it will have
defined a type 'efi_##f##_t' to make use of it. It is unnecessarily
forcing the users to create a new typedef when __efi_rt_asm_wrapper()
actually expects void pointer.

Simplify the arch_efi_call_virt() macro by eliminating the explicit
need for efi_##f##_t type for every user of this macro.

This change is done to align with implementations on other similar
architectures.

Cc: Ard Biesheuvel <ardb at kernel.org>
Cc: Russell King <linux at armlinux.org.uk>
Signed-off-by: Sudeep Holla <sudeep.holla at arm.com>
---
 arch/arm/include/asm/efi.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

v1[1]->v2:
	- Dropped the usage of even typeof() and simply call p->f(args)
	  as suggested by Ard

[1] https://lore.kernel.org/r/20220628125938.694256-1-sudeep.holla@arm.com/

diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h
index 27218eabbf9a..bb4d15101de4 100644
--- a/arch/arm/include/asm/efi.h
+++ b/arch/arm/include/asm/efi.h
@@ -24,12 +24,7 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md);
 #define arch_efi_call_virt_setup()	efi_virtmap_load()
 #define arch_efi_call_virt_teardown()	efi_virtmap_unload()
 
-#define arch_efi_call_virt(p, f, args...)				\
-({									\
-	efi_##f##_t *__f;						\
-	__f = p->f;							\
-	__f(args);							\
-})
+#define arch_efi_call_virt(p, f, args...)	((p)->f(args))
 
 #define ARCH_EFI_IRQ_FLAGS_MASK \
 	(PSR_J_BIT | PSR_E_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT | \
-- 
2.37.0