Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1323570

[PATCH 02/14] efi: Remove redundant efi_set_variable_nonblocking prototype

Show all headers | View raw

From: Ard Biesheuvel <ard.biesheuvel@linaro.org>

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>
---
 include/linux/efi.h | 8 ++------
 1 file 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
 typedef efi_status_t efi_set_variable_t (efi_char16_t *name, efi_guid_t *vendor, 
 					 u32 attr, unsigned long data_size,
 					 void *data);
-typedef efi_status_t
-efi_set_variable_nonblocking_t(efi_char16_t *name, efi_guid_t *vendor,
-			       u32 attr, unsigned long data_size, void *data);
-
 typedef efi_status_t efi_get_next_high_mono_count_t (u32 *count);
 typedef void efi_reset_system_t (int reset_type, efi_status_t status,
 				 unsigned long data_size, efi_char16_t *data);
@@ -851,7 +847,7 @@ extern struct efi {
 	efi_get_variable_t *get_variable;
 	efi_get_next_variable_t *get_next_variable;
 	efi_set_variable_t *set_variable;
-	efi_set_variable_nonblocking_t *set_variable_nonblocking;
+	efi_set_variable_t *set_variable_nonblocking;
 	efi_query_variable_info_t *query_variable_info;
 	efi_update_capsule_t *update_capsule;
 	efi_query_capsule_caps_t *query_capsule_caps;
@@ -1091,7 +1087,7 @@ struct efivar_operations {
 	efi_get_variable_t *get_variable;
 	efi_get_next_variable_t *get_next_variable;
 	efi_set_variable_t *set_variable;
-	efi_set_variable_nonblocking_t *set_variable_nonblocking;
+	efi_set_variable_t *set_variable_nonblocking;
 	efi_query_variable_store_t *query_variable_store;
 };
 
-- 
2.6.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/14] EFI changes for v4.6 Matt Fleming <matt@codeblueprint.co.uk> - 2016-02-01 23:20 +0100
  [PATCH 02/14] efi: Remove redundant efi_set_variable_nonblocking prototype Matt Fleming <matt@codeblueprint.co.uk> - 2016-02-01 23:20 +0100
    [tip:efi/core] efi: Remove redundant efi_set_variable_nonblocking  () prototype tip-bot for Ard Biesheuvel <tipbot@zytor.com> - 2016-02-03 12:40 +0100
  [PATCH 05/14] efi: runtime-wrappers: Remove out of date comment regarding in_nmi() Matt Fleming <matt@codeblueprint.co.uk> - 2016-02-01 23:20 +0100
    [tip:efi/core] efi/runtime-wrappers:   Remove out of date comment regarding in_nmi() tip-bot for Ard Biesheuvel <tipbot@zytor.com> - 2016-02-03 12:40 +0100
  [PATCH 04/14] efi: Add nonblocking option to efi_query_variable_store() Matt Fleming <matt@codeblueprint.co.uk> - 2016-02-01 23:20 +0100
    [tip:efi/core] efi:   Add nonblocking option to efi_query_variable_store() tip-bot for Ard Biesheuvel <tipbot@zytor.com> - 2016-02-03 12:40 +0100

csiph-web