efi_loader: struct efi_simple_text_input_protocol

%s/efi_simple_input_interface/efi_simple_text_input_protocol/

We should be consistent in the naming of the EFI protocol interface
structures. The protocol is called EFI_SIMPLE_TEXT_INPUT_PROTOCOL.

%s/ExtendedVerification/extended_verification/

Use consistent naming of function parameters. Do not use CamelCase.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index 399dfd65fefed1d3b68ac03324d3965528c53847..1b54d1880f93aa51723a86ebefad36d4abc3f6e1 100644 (file)
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -17,7 +17,7 @@
 
 /* Information about the efi console */
 struct serial_efi_priv {
-       struct efi_simple_input_interface *con_in;
+       struct efi_simple_text_input_protocol *con_in;
        struct efi_simple_text_output_protocol *con_out;
        struct efi_input_key key;
        bool have_key;

diff --git a/include/efi_api.h b/include/efi_api.h
index 1efc448184b78e1acf0ed789203426e2e4973301..26e88f494c5b1728df232aebd7f6aed951a91281 100644 (file)
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -308,7 +308,7 @@ struct efi_system_table {
        u16 *fw_vendor;   /* physical addr of wchar_t vendor string */
        u32 fw_revision;
        efi_handle_t con_in_handle;
-       struct efi_simple_input_interface *con_in;
+       struct efi_simple_text_input_protocol *con_in;
        efi_handle_t con_out_handle;
        struct efi_simple_text_output_protocol *con_out;
        efi_handle_t stderr_handle;
@@ -598,11 +598,11 @@ struct efi_input_key {
        EFI_GUID(0x387477c1, 0x69c7, 0x11d2, \
                 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
 
-struct efi_simple_input_interface {
-       efi_status_t(EFIAPI *reset)(struct efi_simple_input_interface *this,
-                       bool ExtendedVerification);
+struct efi_simple_text_input_protocol {
+       efi_status_t(EFIAPI *reset)(struct efi_simple_text_input_protocol *this,
+                                   bool extended_verification);
        efi_status_t(EFIAPI *read_key_stroke)(
-                       struct efi_simple_input_interface *this,
+                       struct efi_simple_text_input_protocol *this,
                        struct efi_input_key *key);
        struct efi_event *wait_for_key;
 };

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 736e82c506faf712e4c308fb2e340d3e30347cba..3bf059b447d8860363dfc2f27ef906da14c3d162 100644 (file)
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -92,7 +92,7 @@ extern struct efi_runtime_services efi_runtime_services;
 extern struct efi_system_table systab;
 
 extern struct efi_simple_text_output_protocol efi_con_out;
-extern struct efi_simple_input_interface efi_con_in;
+extern struct efi_simple_text_input_protocol efi_con_in;
 extern struct efi_console_control_protocol efi_console_control;
 extern const struct efi_device_path_to_text_protocol efi_device_path_to_text;
 /* implementation of the EFI_DEVICE_PATH_UTILITIES_PROTOCOL */

diff --git a/include/efi_selftest.h b/include/efi_selftest.h
index d0a76d70cae44996a13e60580a15c8bce4dccc72..59b3c080bde60f9930f7675e07ceeec9b495fdc7 100644 (file)
--- a/include/efi_selftest.h
+++ b/include/efi_selftest.h
@@ -53,7 +53,7 @@ enum efi_test_phase {
 };
 
 extern struct efi_simple_text_output_protocol *con_out;
-extern struct efi_simple_input_interface *con_in;
+extern struct efi_simple_text_input_protocol *con_in;
 
 /*
  * Exit the boot services.

diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c
index 277eb91e522340de32e4f618c5c1982fa7811132..426567c946f43371ded73a84080abf949cff1836 100644 (file)
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@@ -391,7 +391,7 @@ struct efi_simple_text_output_protocol efi_con_out = {
 };
 
 static efi_status_t EFIAPI efi_cin_reset(
-                       struct efi_simple_input_interface *this,
+                       struct efi_simple_text_input_protocol *this,
                        bool extended_verification)
 {
        EFI_ENTRY("%p, %d", this, extended_verification);
@@ -446,7 +446,7 @@ out:
 }
 
 static efi_status_t EFIAPI efi_cin_read_key_stroke(
-                       struct efi_simple_input_interface *this,
+                       struct efi_simple_text_input_protocol *this,
                        struct efi_input_key *key)
 {
        struct efi_input_key pressed_key = {
@@ -558,7 +558,7 @@ static efi_status_t EFIAPI efi_cin_read_key_stroke(
        return EFI_EXIT(EFI_SUCCESS);
 }
 
-struct efi_simple_input_interface efi_con_in = {
+struct efi_simple_text_input_protocol efi_con_in = {
        .reset = efi_cin_reset,
        .read_key_stroke = efi_cin_read_key_stroke,
        .wait_for_key = NULL,

diff --git a/lib/efi_selftest/efi_selftest_console.c b/lib/efi_selftest/efi_selftest_console.c
index eb139c127cb5bcba177a52a966aa797218630d33..42f51b652036ee31037226bc62f53f9e87515dfc 100644 (file)
--- a/lib/efi_selftest/efi_selftest_console.c
+++ b/lib/efi_selftest/efi_selftest_console.c
@@ -9,7 +9,7 @@
 #include <vsprintf.h>
 
 struct efi_simple_text_output_protocol *con_out;
-struct efi_simple_input_interface *con_in;
+struct efi_simple_text_input_protocol *con_in;
 
 /*
  * Print a MAC address to an u16 string