Commit cb46a58d authored by Breno Leitao's avatar Breno Leitao Committed by Ard Biesheuvel
Browse files

efi/memattr: Convert efi_memattr_init() return type to void 



The efi_memattr_init() function's return values (0 and -ENOMEM) are never
checked by callers. Convert the function to return void since the return
status is unused.

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 793b1354

drivers/firmware/efi/memattr.c

+3 −4
Original line number Diff line number Diff line
@@ -19,19 +19,19 @@ unsigned long __ro_after_init efi_mem_attr_table = EFI_INVALID_TABLE_ADDR; 
 * Reserve the memory associated with the Memory Attributes configuration

 * table, if it exists.

 */

int __init efi_memattr_init(void)

void __init efi_memattr_init(void)

{

	efi_memory_attributes_table_t *tbl;

	unsigned long size;



	if (efi_mem_attr_table == EFI_INVALID_TABLE_ADDR)

		return 0;

		return;



	tbl = early_memremap(efi_mem_attr_table, sizeof(*tbl));

	if (!tbl) {

		pr_err("Failed to map EFI Memory Attributes table @ 0x%lx\n",

		       efi_mem_attr_table);

		return -ENOMEM;

		return;

	}



	if (tbl->version > 2) {
@@ -61,7 +61,6 @@ int __init efi_memattr_init(void) 


unmap:

	early_memunmap(tbl, sizeof(*tbl));

	return 0;

}



/*

include/linux/efi.h

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ extern unsigned long efi_mem_attr_table; 
 */

typedef int (*efi_memattr_perm_setter)(struct mm_struct *, efi_memory_desc_t *, bool);



extern int efi_memattr_init(void);

extern void efi_memattr_init(void);

extern int efi_memattr_apply_permissions(struct mm_struct *mm,

					 efi_memattr_perm_setter fn);