From: "Michał Kępień" <kernel@kempniu.pl>
To: "Darren Hart" <dvhart@infradead.org>,
"Matthew Garrett" <mjg59@srcf.ucam.org>,
"Pali Rohár" <pali.rohar@gmail.com>,
"Richard Purdie" <rpurdie@rpsys.net>,
"Jacek Anaszewski" <j.anaszewski@samsung.com>
Cc: platform-driver-x86@vger.kernel.org, linux-leds@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 06/16] dell-smbios: don't pass an SMBIOS buffer to dell_smbios_send_request()
Date: Fri, 22 Jan 2016 15:27:18 +0100 [thread overview]
Message-ID: <1453472848-3118-7-git-send-email-kernel@kempniu.pl> (raw)
In-Reply-To: <1453472848-3118-1-git-send-email-kernel@kempniu.pl>
Passing an SMBIOS buffer pointer to dell_smbios_send_request() is
redundant as it should always operate on the SMBIOS buffer exported from
the module.
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
drivers/platform/x86/dell-laptop.c | 42 ++++++++++++++++++------------------
drivers/platform/x86/dell-smbios.c | 3 +--
drivers/platform/x86/dell-smbios.h | 3 +--
3 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 9210acf..0bb2211 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -418,7 +418,7 @@ static int dell_rfkill_set(void *data, bool blocked)
dell_smbios_get_buffer();
- dell_smbios_send_request(buffer, 17, 11);
+ dell_smbios_send_request(17, 11);
ret = buffer->output[0];
status = buffer->output[1];
@@ -428,7 +428,7 @@ static int dell_rfkill_set(void *data, bool blocked)
dell_smbios_clear_buffer();
buffer->input[0] = 0x2;
- dell_smbios_send_request(buffer, 17, 11);
+ dell_smbios_send_request(17, 11);
ret = buffer->output[0];
hwswitch = buffer->output[1];
@@ -441,7 +441,7 @@ static int dell_rfkill_set(void *data, bool blocked)
dell_smbios_clear_buffer();
buffer->input[0] = (1 | (radio<<8) | (disable << 16));
- dell_smbios_send_request(buffer, 17, 11);
+ dell_smbios_send_request(17, 11);
ret = buffer->output[0];
out:
@@ -458,7 +458,7 @@ static void dell_rfkill_update_sw_state(struct rfkill *rfkill, int radio,
int block = rfkill_blocked(rfkill);
dell_smbios_clear_buffer();
buffer->input[0] = (1 | (radio << 8) | (block << 16));
- dell_smbios_send_request(buffer, 17, 11);
+ dell_smbios_send_request(17, 11);
} else {
/* No hw-switch, sync BIOS state to sw_state */
rfkill_set_sw_state(rfkill, !!(status & BIT(radio + 16)));
@@ -481,7 +481,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data)
dell_smbios_get_buffer();
- dell_smbios_send_request(buffer, 17, 11);
+ dell_smbios_send_request(17, 11);
ret = buffer->output[0];
status = buffer->output[1];
@@ -493,7 +493,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data)
dell_smbios_clear_buffer();
buffer->input[0] = 0x2;
- dell_smbios_send_request(buffer, 17, 11);
+ dell_smbios_send_request(17, 11);
ret = buffer->output[0];
hwswitch = buffer->output[1];
@@ -521,14 +521,14 @@ static int dell_debugfs_show(struct seq_file *s, void *data)
dell_smbios_get_buffer();
- dell_smbios_send_request(buffer, 17, 11);
+ dell_smbios_send_request(17, 11);
ret = buffer->output[0];
status = buffer->output[1];
dell_smbios_clear_buffer();
buffer->input[0] = 0x2;
- dell_smbios_send_request(buffer, 17, 11);
+ dell_smbios_send_request(17, 11);
hwswitch_ret = buffer->output[0];
hwswitch_state = buffer->output[1];
@@ -619,7 +619,7 @@ static void dell_update_rfkill(struct work_struct *ignored)
dell_smbios_get_buffer();
- dell_smbios_send_request(buffer, 17, 11);
+ dell_smbios_send_request(17, 11);
ret = buffer->output[0];
status = buffer->output[1];
@@ -629,7 +629,7 @@ static void dell_update_rfkill(struct work_struct *ignored)
dell_smbios_clear_buffer();
buffer->input[0] = 0x2;
- dell_smbios_send_request(buffer, 17, 11);
+ dell_smbios_send_request(17, 11);
ret = buffer->output[0];
if (ret == 0 && (status & BIT(0)))
@@ -710,7 +710,7 @@ static int __init dell_setup_rfkill(void)
return 0;
dell_smbios_get_buffer();
- dell_smbios_send_request(buffer, 17, 11);
+ dell_smbios_send_request(17, 11);
ret = buffer->output[0];
status = buffer->output[1];
dell_smbios_release_buffer();
@@ -878,9 +878,9 @@ static int dell_send_intensity(struct backlight_device *bd)
buffer->input[1] = bd->props.brightness;
if (power_supply_is_system_supplied() > 0)
- dell_smbios_send_request(buffer, 1, 2);
+ dell_smbios_send_request(1, 2);
else
- dell_smbios_send_request(buffer, 1, 1);
+ dell_smbios_send_request(1, 1);
ret = dell_smi_error(buffer->output[0]);
@@ -901,9 +901,9 @@ static int dell_get_intensity(struct backlight_device *bd)
buffer->input[0] = token;
if (power_supply_is_system_supplied() > 0)
- dell_smbios_send_request(buffer, 0, 2);
+ dell_smbios_send_request(0, 2);
else
- dell_smbios_send_request(buffer, 0, 1);
+ dell_smbios_send_request(0, 1);
if (buffer->output[0])
ret = dell_smi_error(buffer->output[0]);
@@ -1160,7 +1160,7 @@ static int kbd_get_info(struct kbd_info *info)
dell_smbios_get_buffer();
buffer->input[0] = 0x0;
- dell_smbios_send_request(buffer, 4, 11);
+ dell_smbios_send_request(4, 11);
ret = buffer->output[0];
if (ret) {
@@ -1248,7 +1248,7 @@ static int kbd_get_state(struct kbd_state *state)
dell_smbios_get_buffer();
buffer->input[0] = 0x1;
- dell_smbios_send_request(buffer, 4, 11);
+ dell_smbios_send_request(4, 11);
ret = buffer->output[0];
if (ret) {
@@ -1284,7 +1284,7 @@ static int kbd_set_state(struct kbd_state *state)
buffer->input[1] |= (state->timeout_unit & 0x3) << 30;
buffer->input[2] = state->als_setting & 0xFF;
buffer->input[2] |= (state->level & 0xFF) << 16;
- dell_smbios_send_request(buffer, 4, 11);
+ dell_smbios_send_request(4, 11);
ret = buffer->output[0];
dell_smbios_release_buffer();
@@ -1326,7 +1326,7 @@ static int kbd_set_token_bit(u8 bit)
dell_smbios_get_buffer();
buffer->input[0] = da_tokens[id].location;
buffer->input[1] = da_tokens[id].value;
- dell_smbios_send_request(buffer, 1, 0);
+ dell_smbios_send_request(1, 0);
ret = buffer->output[0];
dell_smbios_release_buffer();
@@ -1348,7 +1348,7 @@ static int kbd_get_token_bit(u8 bit)
dell_smbios_get_buffer();
buffer->input[0] = da_tokens[id].location;
- dell_smbios_send_request(buffer, 0, 0);
+ dell_smbios_send_request(0, 0);
ret = buffer->output[0];
val = buffer->output[1];
dell_smbios_release_buffer();
@@ -2019,7 +2019,7 @@ static int __init dell_init(void)
if (token != -1) {
dell_smbios_get_buffer();
buffer->input[0] = token;
- dell_smbios_send_request(buffer, 0, 2);
+ dell_smbios_send_request(0, 2);
if (buffer->output[0] == 0)
max_intensity = buffer->output[3];
dell_smbios_release_buffer();
diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c
index a0c1bde..d573765 100644
--- a/drivers/platform/x86/dell-smbios.c
+++ b/drivers/platform/x86/dell-smbios.c
@@ -60,8 +60,7 @@ void dell_smbios_release_buffer(void)
EXPORT_SYMBOL_GPL(dell_smbios_release_buffer);
struct calling_interface_buffer *
-dell_smbios_send_request(struct calling_interface_buffer *buffer,
- int class, int select)
+dell_smbios_send_request(int class, int select)
{
struct smi_cmd command;
diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h
index 33ed971..4220ac1 100644
--- a/drivers/platform/x86/dell-smbios.h
+++ b/drivers/platform/x86/dell-smbios.h
@@ -42,8 +42,7 @@ void dell_smbios_get_buffer(void);
void dell_smbios_clear_buffer(void);
void dell_smbios_release_buffer(void);
struct calling_interface_buffer *
-dell_smbios_send_request(struct calling_interface_buffer *buffer,
- int class, int select);
+dell_smbios_send_request(int class, int select);
int find_token_id(int tokenid);
int find_token_location(int tokenid);
--
1.7.10.4
next prev parent reply other threads:[~2016-01-22 14:27 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-22 14:27 [PATCH v2 00/16] Common Dell SMBIOS API Michał Kępień
2016-01-22 14:27 ` [PATCH v2 01/16] dell-laptop: extract SMBIOS-related code to a separate module Michał Kępień
2016-01-24 2:16 ` kbuild test robot
2016-01-26 13:33 ` Michał Kępień
2016-01-22 14:27 ` [PATCH v2 02/16] dell-smbios: rename get_buffer() to dell_smbios_get_buffer() Michał Kępień
2016-01-22 14:27 ` [PATCH v2 03/16] dell-smbios: rename clear_buffer() to dell_smbios_clear_buffer() Michał Kępień
2016-01-22 14:27 ` [PATCH v2 04/16] dell-smbios: rename release_buffer() to dell_smbios_release_buffer() Michał Kępień
2016-01-22 14:27 ` [PATCH v2 05/16] dell-smbios: rename dell_send_request() to dell_smbios_send_request() Michał Kępień
2016-01-22 14:27 ` Michał Kępień [this message]
2016-01-22 14:27 ` [PATCH v2 07/16] dell-smbios: don't return an SMBIOS buffer from dell_smbios_send_request() Michał Kępień
2016-02-08 18:44 ` Darren Hart
2016-02-09 13:27 ` Michał Kępień
2016-02-09 16:50 ` Darren Hart
2016-02-09 17:34 ` Michał Kępień
2016-01-22 14:27 ` [PATCH v2 08/16] dell-smbios: return the SMBIOS buffer from dell_smbios_get_buffer() Michał Kępień
2016-01-22 14:27 ` [PATCH v2 09/16] dell-smbios: make the SMBIOS buffer static Michał Kępień
2016-01-22 14:27 ` [PATCH v2 10/16] dell-smbios: implement new function for finding DMI table 0xDA tokens Michał Kępień
2016-01-22 14:27 ` [PATCH v2 11/16] dell-laptop: use dell_smbios_find_token() instead of find_token_id() Michał Kępień
2016-01-22 14:27 ` [PATCH v2 12/16] dell-laptop: use dell_smbios_find_token() instead of find_token_location() Michał Kępień
2016-01-22 14:27 ` [PATCH v2 13/16] dell-smbios: remove find_token_{id,location}() Michał Kępień
2016-01-22 14:27 ` [PATCH v2 14/16] dell-smbios: make da_tokens static Michał Kępień
2016-01-22 14:27 ` [PATCH v2 15/16] dell-led: use dell_smbios_find_token() for finding mic DMI tokens Michał Kępień
2016-01-22 14:27 ` [PATCH v2 16/16] dell-led: use dell_smbios_send_request() for performing SMBIOS calls Michał Kępień
2016-01-22 14:48 ` [PATCH v2 00/16] Common Dell SMBIOS API Pali Rohár
2016-02-07 20:34 ` Darren Hart
2016-02-08 19:20 ` Darren Hart
2016-02-08 19:29 ` Greg Kroah-Hartman
2016-02-08 20:46 ` Darren Hart
2016-02-08 21:04 ` Pali Rohár
2016-02-08 21:31 ` Darren Hart
2016-02-09 14:15 ` Michał Kępień
2016-02-08 19:30 ` Lukas Wunner
2016-02-08 20:43 ` Darren Hart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453472848-3118-7-git-send-email-kernel@kempniu.pl \
--to=kernel@kempniu.pl \
--cc=dvhart@infradead.org \
--cc=j.anaszewski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=mjg59@srcf.ucam.org \
--cc=pali.rohar@gmail.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rpurdie@rpsys.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).