diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-02-01 17:06:56 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-03 05:31:02 -0500 |
commit | 70d2a3cf2f4ae2e93b7a661842d84c2b5132cee7 (patch) | |
tree | 4a24887e994413731ceaf4ecba39e0993ae7cea4 /include/linux/efi.h | |
parent | 9c6672ac9c91f7eb1ec436be1442b8c26d098e55 (diff) |
efi: Remove redundant efi_set_variable_nonblocking() prototype
There is no need for a separate nonblocking prototype definition
for the SetVariable() UEFI Runtime Service, since it is
identical to the blocking version.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/1454364428-494-3-git-send-email-matt@codeblueprint.co.uk
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/efi.h')
-rw-r--r-- | include/linux/efi.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index 569b5a866bb1..8706e0aabedc 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h | |||
@@ -507,10 +507,6 @@ typedef efi_status_t efi_get_next_variable_t (unsigned long *name_size, efi_char | |||
507 | typedef efi_status_t efi_set_variable_t (efi_char16_t *name, efi_guid_t *vendor, | 507 | typedef efi_status_t efi_set_variable_t (efi_char16_t *name, efi_guid_t *vendor, |
508 | u32 attr, unsigned long data_size, | 508 | u32 attr, unsigned long data_size, |
509 | void *data); | 509 | void *data); |
510 | typedef efi_status_t | ||
511 | efi_set_variable_nonblocking_t(efi_char16_t *name, efi_guid_t *vendor, | ||
512 | u32 attr, unsigned long data_size, void *data); | ||
513 | |||
514 | typedef efi_status_t efi_get_next_high_mono_count_t (u32 *count); | 510 | typedef efi_status_t efi_get_next_high_mono_count_t (u32 *count); |
515 | typedef void efi_reset_system_t (int reset_type, efi_status_t status, | 511 | typedef void efi_reset_system_t (int reset_type, efi_status_t status, |
516 | unsigned long data_size, efi_char16_t *data); | 512 | unsigned long data_size, efi_char16_t *data); |
@@ -851,7 +847,7 @@ extern struct efi { | |||
851 | efi_get_variable_t *get_variable; | 847 | efi_get_variable_t *get_variable; |
852 | efi_get_next_variable_t *get_next_variable; | 848 | efi_get_next_variable_t *get_next_variable; |
853 | efi_set_variable_t *set_variable; | 849 | efi_set_variable_t *set_variable; |
854 | efi_set_variable_nonblocking_t *set_variable_nonblocking; | 850 | efi_set_variable_t *set_variable_nonblocking; |
855 | efi_query_variable_info_t *query_variable_info; | 851 | efi_query_variable_info_t *query_variable_info; |
856 | efi_update_capsule_t *update_capsule; | 852 | efi_update_capsule_t *update_capsule; |
857 | efi_query_capsule_caps_t *query_capsule_caps; | 853 | efi_query_capsule_caps_t *query_capsule_caps; |
@@ -1091,7 +1087,7 @@ struct efivar_operations { | |||
1091 | efi_get_variable_t *get_variable; | 1087 | efi_get_variable_t *get_variable; |
1092 | efi_get_next_variable_t *get_next_variable; | 1088 | efi_get_next_variable_t *get_next_variable; |
1093 | efi_set_variable_t *set_variable; | 1089 | efi_set_variable_t *set_variable; |
1094 | efi_set_variable_nonblocking_t *set_variable_nonblocking; | 1090 | efi_set_variable_t *set_variable_nonblocking; |
1095 | efi_query_variable_store_t *query_variable_store; | 1091 | efi_query_variable_store_t *query_variable_store; |
1096 | }; | 1092 | }; |
1097 | 1093 | ||