Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b767b16 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

efi/x86: Align efi_uga_draw_protocol typedef names to convention 



The linux-efi subsystem uses typedefs with the _t suffix to declare
data structures that originate in the UEFI spec. Our type mangling
for mixed mode depends on this convention, so rename the UGA drawing
protocols to allow efi_call_proto() to be used with them in a
subsequent patch.

Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Lukas Wunner <lukas@wunner.de>
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-4-ard.biesheuvel@linaro.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 75c5a713

arch/x86/boot/compressed/eboot.c

+2 −2
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static void setup_quirks(struct boot_params *boot_params) 
static efi_status_t

setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height)

{

	struct efi_uga_draw_protocol *uga = NULL, *first_uga;

	efi_uga_draw_protocol_t *uga = NULL, *first_uga;

	efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;

	unsigned long nr_ugas;

	u32 *handles = (u32 *)uga_handle;
@@ -366,7 +366,7 @@ setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height) 
static efi_status_t

setup_uga64(void **uga_handle, unsigned long size, u32 *width, u32 *height)

{

	struct efi_uga_draw_protocol *uga = NULL, *first_uga;

	efi_uga_draw_protocol_t *uga = NULL, *first_uga;

	efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;

	unsigned long nr_ugas;

	u64 *handles = (u64 *)uga_handle;

arch/x86/boot/compressed/eboot.h

+6 −6
Original line number Diff line number Diff line
@@ -12,22 +12,22 @@ 


#define DESC_TYPE_CODE_DATA	(1 << 0)



struct efi_uga_draw_protocol_32 {

typedef struct {

	u32 get_mode;

	u32 set_mode;

	u32 blt;

};

} efi_uga_draw_protocol_32_t;



struct efi_uga_draw_protocol_64 {

typedef struct {

	u64 get_mode;

	u64 set_mode;

	u64 blt;

};

} efi_uga_draw_protocol_64_t;



struct efi_uga_draw_protocol {

typedef struct {

	void *get_mode;

	void *set_mode;

	void *blt;

};

} efi_uga_draw_protocol_t;



#endif /* BOOT_COMPRESSED_EBOOT_H */