lkml.org 
[lkml]   [2024]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 2/3] platform/x86: dell-smbios: Move request functions for reuse
    Date
    Move the dell_send_request and dell_fill_request symbols into smbios-base
    so that they can be used in multiple modules.

    Signed-off-by: Lyndon Sanche <lsanche@lyndeno.ca>
    ---
    drivers/platform/x86/dell/dell-laptop.c | 23 ------------------
    drivers/platform/x86/dell/dell-smbios-base.c | 25 ++++++++++++++++++++
    drivers/platform/x86/dell/dell-smbios.h | 5 ++++
    3 files changed, 30 insertions(+), 23 deletions(-)

    diff --git a/drivers/platform/x86/dell/dell-laptop.c b/drivers/platform/x86/dell/dell-laptop.c
    index 42f7de2b4522..6552dfe491c6 100644
    --- a/drivers/platform/x86/dell/dell-laptop.c
    +++ b/drivers/platform/x86/dell/dell-laptop.c
    @@ -353,29 +353,6 @@ static const struct dmi_system_id dell_quirks[] __initconst = {
    { }
    };

    -static void dell_fill_request(struct calling_interface_buffer *buffer,
    - u32 arg0, u32 arg1, u32 arg2, u32 arg3)
    -{
    - memset(buffer, 0, sizeof(struct calling_interface_buffer));
    - buffer->input[0] = arg0;
    - buffer->input[1] = arg1;
    - buffer->input[2] = arg2;
    - buffer->input[3] = arg3;
    -}
    -
    -static int dell_send_request(struct calling_interface_buffer *buffer,
    - u16 class, u16 select)
    -{
    - int ret;
    -
    - buffer->cmd_class = class;
    - buffer->cmd_select = select;
    - ret = dell_smbios_call(buffer);
    - if (ret != 0)
    - return ret;
    - return dell_smbios_error(buffer->output[0]);
    -}
    -
    /*
    * Derived from information in smbios-wireless-ctl:
    *
    diff --git a/drivers/platform/x86/dell/dell-smbios-base.c b/drivers/platform/x86/dell/dell-smbios-base.c
    index fbdd12a7cb8d..515c454acfe6 100644
    --- a/drivers/platform/x86/dell/dell-smbios-base.c
    +++ b/drivers/platform/x86/dell/dell-smbios-base.c
    @@ -314,6 +314,31 @@ int dell_smbios_call(struct calling_interface_buffer *buffer)
    }
    EXPORT_SYMBOL_GPL(dell_smbios_call);

    +void dell_fill_request(struct calling_interface_buffer *buffer,
    + u32 arg0, u32 arg1, u32 arg2, u32 arg3)
    +{
    + memset(buffer, 0, sizeof(struct calling_interface_buffer));
    + buffer->input[0] = arg0;
    + buffer->input[1] = arg1;
    + buffer->input[2] = arg2;
    + buffer->input[3] = arg3;
    +}
    +EXPORT_SYMBOL_GPL(dell_fill_request);
    +
    +int dell_send_request(struct calling_interface_buffer *buffer,
    + u16 class, u16 select)
    +{
    + int ret;
    +
    + buffer->cmd_class = class;
    + buffer->cmd_select = select;
    + ret = dell_smbios_call(buffer);
    + if (ret != 0)
    + return ret;
    + return dell_smbios_error(buffer->output[0]);
    +}
    +EXPORT_SYMBOL_GPL(dell_send_request);
    +
    struct calling_interface_token *dell_smbios_find_token(int tokenid)
    {
    int i;
    diff --git a/drivers/platform/x86/dell/dell-smbios.h b/drivers/platform/x86/dell/dell-smbios.h
    index 756c354b1eef..1d6463cca12a 100644
    --- a/drivers/platform/x86/dell/dell-smbios.h
    +++ b/drivers/platform/x86/dell/dell-smbios.h
    @@ -64,6 +64,11 @@ int dell_smbios_call_filter(struct device *d,
    struct calling_interface_buffer *buffer);
    int dell_smbios_call(struct calling_interface_buffer *buffer);

    +void dell_fill_request(struct calling_interface_buffer *buffer,
    + u32 arg0, u32 arg1, u32 arg2, u32 arg3);
    +int dell_send_request(struct calling_interface_buffer *buffer,
    + u16 class, u16 select);
    +
    struct calling_interface_token *dell_smbios_find_token(int tokenid);

    enum dell_laptop_notifier_actions {
    --
    2.42.0

    \
     
     \ /
      Last update: 2024-05-18 00:44    [W:4.086 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site