Skip to content

Commit 2e45454

Browse files
committed
efi/runtime-wrappers: Clean up white space and add __init annotation
JIRA: https://issues.redhat.com/browse/RHEL-22695 Tested: sanity commit a14198d Author: Ard Biesheuvel <[email protected]> Date: Tue Aug 8 14:49:12 2023 +0200 efi/runtime-wrappers: Clean up white space and add __init annotation Some cosmetic changes as well as a missing __init annotation. Signed-off-by: Ard Biesheuvel <[email protected]> Signed-off-by: Aristeu Rozanski <[email protected]>
1 parent 795fffe commit 2e45454

File tree

1 file changed

+19
-22
lines changed

1 file changed

+19
-22
lines changed

drivers/firmware/efi/runtime-wrappers.c

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,8 @@ static efi_status_t virt_efi_set_variable(efi_char16_t *name,
436436
}
437437

438438
static efi_status_t
439-
virt_efi_set_variable_nonblocking(efi_char16_t *name, efi_guid_t *vendor,
440-
u32 attr, unsigned long data_size,
441-
void *data)
439+
virt_efi_set_variable_nb(efi_char16_t *name, efi_guid_t *vendor, u32 attr,
440+
unsigned long data_size, void *data)
442441
{
443442
efi_status_t status;
444443

@@ -471,10 +470,8 @@ static efi_status_t virt_efi_query_variable_info(u32 attr,
471470
}
472471

473472
static efi_status_t
474-
virt_efi_query_variable_info_nonblocking(u32 attr,
475-
u64 *storage_space,
476-
u64 *remaining_space,
477-
u64 *max_variable_size)
473+
virt_efi_query_variable_info_nb(u32 attr, u64 *storage_space,
474+
u64 *remaining_space, u64 *max_variable_size)
478475
{
479476
efi_status_t status;
480477

@@ -556,22 +553,22 @@ static efi_status_t virt_efi_query_capsule_caps(efi_capsule_header_t **capsules,
556553
return status;
557554
}
558555

559-
void efi_native_runtime_setup(void)
556+
void __init efi_native_runtime_setup(void)
560557
{
561-
efi.get_time = virt_efi_get_time;
562-
efi.set_time = virt_efi_set_time;
563-
efi.get_wakeup_time = virt_efi_get_wakeup_time;
564-
efi.set_wakeup_time = virt_efi_set_wakeup_time;
565-
efi.get_variable = virt_efi_get_variable;
566-
efi.get_next_variable = virt_efi_get_next_variable;
567-
efi.set_variable = virt_efi_set_variable;
568-
efi.set_variable_nonblocking = virt_efi_set_variable_nonblocking;
569-
efi.get_next_high_mono_count = virt_efi_get_next_high_mono_count;
570-
efi.reset_system = virt_efi_reset_system;
571-
efi.query_variable_info = virt_efi_query_variable_info;
572-
efi.query_variable_info_nonblocking = virt_efi_query_variable_info_nonblocking;
573-
efi.update_capsule = virt_efi_update_capsule;
574-
efi.query_capsule_caps = virt_efi_query_capsule_caps;
558+
efi.get_time = virt_efi_get_time;
559+
efi.set_time = virt_efi_set_time;
560+
efi.get_wakeup_time = virt_efi_get_wakeup_time;
561+
efi.set_wakeup_time = virt_efi_set_wakeup_time;
562+
efi.get_variable = virt_efi_get_variable;
563+
efi.get_next_variable = virt_efi_get_next_variable;
564+
efi.set_variable = virt_efi_set_variable;
565+
efi.set_variable_nonblocking = virt_efi_set_variable_nb;
566+
efi.get_next_high_mono_count = virt_efi_get_next_high_mono_count;
567+
efi.reset_system = virt_efi_reset_system;
568+
efi.query_variable_info = virt_efi_query_variable_info;
569+
efi.query_variable_info_nonblocking = virt_efi_query_variable_info_nb;
570+
efi.update_capsule = virt_efi_update_capsule;
571+
efi.query_capsule_caps = virt_efi_query_capsule_caps;
575572
}
576573

577574
#ifdef CONFIG_ACPI_PRMT

0 commit comments

Comments
 (0)