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

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

efi: Align efi_pci_io_protocol typedefs to type naming convention 



In order to use the helper macros that perform type mangling with the
EFI PCI I/O protocol struct typedefs, align their Linux typenames with
the convention we use for definitionns that originate in the UEFI spec,
and add the trailing _t to each.

Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20180504060003.19618-14-ard.biesheuvel@linaro.org


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

arch/x86/boot/compressed/eboot.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -109,7 +109,7 @@ void efi_char16_printk(efi_system_table_t *table, efi_char16_t *str) 
}

}





static efi_status_t

static efi_status_t

__setup_efi_pci32(efi_pci_io_protocol_32 *pci, struct pci_setup_rom **__rom)

__setup_efi_pci32(efi_pci_io_protocol_32_t *pci, struct pci_setup_rom **__rom)

{

{

	struct pci_setup_rom *rom = NULL;

	struct pci_setup_rom *rom = NULL;

	efi_status_t status;

	efi_status_t status;
@@ -176,7 +176,7 @@ static void 
setup_efi_pci32(struct boot_params *params, void **pci_handle,

setup_efi_pci32(struct boot_params *params, void **pci_handle,

		unsigned long size)

		unsigned long size)

{

{

	efi_pci_io_protocol_32 *pci = NULL;

	efi_pci_io_protocol_32_t *pci = NULL;

	efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID;

	efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID;

	u32 *handles = (u32 *)(unsigned long)pci_handle;

	u32 *handles = (u32 *)(unsigned long)pci_handle;

	efi_status_t status;

	efi_status_t status;
@@ -218,7 +218,7 @@ setup_efi_pci32(struct boot_params *params, void **pci_handle, 
}

}





static efi_status_t

static efi_status_t

__setup_efi_pci64(efi_pci_io_protocol_64 *pci, struct pci_setup_rom **__rom)

__setup_efi_pci64(efi_pci_io_protocol_64_t *pci, struct pci_setup_rom **__rom)

{

{

	struct pci_setup_rom *rom;

	struct pci_setup_rom *rom;

	efi_status_t status;

	efi_status_t status;
@@ -284,7 +284,7 @@ static void 
setup_efi_pci64(struct boot_params *params, void **pci_handle,

setup_efi_pci64(struct boot_params *params, void **pci_handle,

		unsigned long size)

		unsigned long size)

{

{

	efi_pci_io_protocol_64 *pci = NULL;

	efi_pci_io_protocol_64_t *pci = NULL;

	efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID;

	efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID;

	u64 *handles = (u64 *)(unsigned long)pci_handle;

	u64 *handles = (u64 *)(unsigned long)pci_handle;

	efi_status_t status;

	efi_status_t status;

include/linux/efi.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -397,7 +397,7 @@ typedef struct { 
	u32 set_bar_attributes;

	u32 set_bar_attributes;

	u64 romsize;

	u64 romsize;

	u32 romimage;

	u32 romimage;

} efi_pci_io_protocol_32;

} efi_pci_io_protocol_32_t;





typedef struct {

typedef struct {

	u64 poll_mem;

	u64 poll_mem;
@@ -417,7 +417,7 @@ typedef struct { 
	u64 set_bar_attributes;

	u64 set_bar_attributes;

	u64 romsize;

	u64 romsize;

	u64 romimage;

	u64 romimage;

} efi_pci_io_protocol_64;

} efi_pci_io_protocol_64_t;





typedef struct {

typedef struct {

	void *poll_mem;

	void *poll_mem;
@@ -437,7 +437,7 @@ typedef struct { 
	void *set_bar_attributes;

	void *set_bar_attributes;

	uint64_t romsize;

	uint64_t romsize;

	void *romimage;

	void *romimage;

} efi_pci_io_protocol;

} efi_pci_io_protocol_t;





#define EFI_PCI_IO_ATTRIBUTE_ISA_MOTHERBOARD_IO 0x0001

#define EFI_PCI_IO_ATTRIBUTE_ISA_MOTHERBOARD_IO 0x0001

#define EFI_PCI_IO_ATTRIBUTE_ISA_IO 0x0002

#define EFI_PCI_IO_ATTRIBUTE_ISA_IO 0x0002