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: Alex Hung <alex.hung@canonical.com>,
platform-driver-x86@vger.kernel.org, linux-leds@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 06/14] dell-smbios: rename release_buffer() to dell_smbios_release_buffer()
Date: Tue, 12 Jan 2016 15:02:52 +0100 [thread overview]
Message-ID: <1452607380-20861-7-git-send-email-kernel@kempniu.pl> (raw)
In-Reply-To: <1452607380-20861-1-git-send-email-kernel@kempniu.pl>
As release_buffer() is exported from the module, it has to be renamed to
something less generic, so add a "dell_smbios_" prefix to the function
name.
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
drivers/platform/x86/dell-laptop.c | 28 ++++++++++++++--------------
drivers/platform/x86/dell-smbios.c | 4 ++--
drivers/platform/x86/dell-smbios.h | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 5df30a9..ab256ae 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -445,7 +445,7 @@ static int dell_rfkill_set(void *data, bool blocked)
ret = dell_smbios_buffer->output[0];
out:
- release_buffer();
+ dell_smbios_release_buffer();
return dell_smi_error(ret);
}
@@ -487,7 +487,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data)
status = dell_smbios_buffer->output[1];
if (ret != 0 || !(status & BIT(0))) {
- release_buffer();
+ dell_smbios_release_buffer();
return;
}
@@ -498,7 +498,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data)
ret = dell_smbios_buffer->output[0];
hwswitch = dell_smbios_buffer->output[1];
- release_buffer();
+ dell_smbios_release_buffer();
if (ret != 0)
return;
@@ -533,7 +533,7 @@ static int dell_debugfs_show(struct seq_file *s, void *data)
hwswitch_ret = dell_smbios_buffer->output[0];
hwswitch_state = dell_smbios_buffer->output[1];
- release_buffer();
+ dell_smbios_release_buffer();
seq_printf(s, "return:\t%d\n", ret);
seq_printf(s, "status:\t0x%X\n", status);
@@ -651,7 +651,7 @@ static void dell_update_rfkill(struct work_struct *ignored)
}
out:
- release_buffer();
+ dell_smbios_release_buffer();
}
static DECLARE_DELAYED_WORK(dell_rfkill_work, dell_update_rfkill);
@@ -714,7 +714,7 @@ static int __init dell_setup_rfkill(void)
dell_send_request(17, 11);
ret = dell_smbios_buffer->output[0];
status = dell_smbios_buffer->output[1];
- release_buffer();
+ dell_smbios_release_buffer();
/* dell wireless info smbios call is not supported */
if (ret != 0)
@@ -885,7 +885,7 @@ static int dell_send_intensity(struct backlight_device *bd)
ret = dell_smi_error(dell_smbios_buffer->output[0]);
- release_buffer();
+ dell_smbios_release_buffer();
return ret;
}
@@ -911,7 +911,7 @@ static int dell_get_intensity(struct backlight_device *bd)
else
ret = dell_smbios_buffer->output[1];
- release_buffer();
+ dell_smbios_release_buffer();
return ret;
}
@@ -1185,7 +1185,7 @@ static int kbd_get_info(struct kbd_info *info)
info->days = (dell_smbios_buffer->output[3] >> 24) & 0xFF;
out:
- release_buffer();
+ dell_smbios_release_buffer();
return ret;
}
@@ -1269,7 +1269,7 @@ static int kbd_get_state(struct kbd_state *state)
state->level = (dell_smbios_buffer->output[2] >> 16) & 0xFF;
out:
- release_buffer();
+ dell_smbios_release_buffer();
return ret;
}
@@ -1287,7 +1287,7 @@ static int kbd_set_state(struct kbd_state *state)
dell_smbios_buffer->input[2] |= (state->level & 0xFF) << 16;
dell_send_request(4, 11);
ret = dell_smbios_buffer->output[0];
- release_buffer();
+ dell_smbios_release_buffer();
return dell_smi_error(ret);
}
@@ -1329,7 +1329,7 @@ static int kbd_set_token_bit(u8 bit)
dell_smbios_buffer->input[1] = da_tokens[id].value;
dell_send_request(1, 0);
ret = dell_smbios_buffer->output[0];
- release_buffer();
+ dell_smbios_release_buffer();
return dell_smi_error(ret);
}
@@ -1352,7 +1352,7 @@ static int kbd_get_token_bit(u8 bit)
dell_send_request(0, 0);
ret = dell_smbios_buffer->output[0];
val = dell_smbios_buffer->output[1];
- release_buffer();
+ dell_smbios_release_buffer();
if (ret)
return dell_smi_error(ret);
@@ -2023,7 +2023,7 @@ static int __init dell_init(void)
dell_send_request(0, 2);
if (dell_smbios_buffer->output[0] == 0)
max_intensity = dell_smbios_buffer->output[3];
- release_buffer();
+ dell_smbios_release_buffer();
}
if (max_intensity) {
diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c
index 27dbfb9..20d7f21 100644
--- a/drivers/platform/x86/dell-smbios.c
+++ b/drivers/platform/x86/dell-smbios.c
@@ -53,11 +53,11 @@ void dell_smbios_get_buffer(void)
}
EXPORT_SYMBOL_GPL(dell_smbios_get_buffer);
-void release_buffer(void)
+void dell_smbios_release_buffer(void)
{
mutex_unlock(&buffer_mutex);
}
-EXPORT_SYMBOL_GPL(release_buffer);
+EXPORT_SYMBOL_GPL(dell_smbios_release_buffer);
int find_token_id(int tokenid)
{
diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h
index e3c2014..1ffd680 100644
--- a/drivers/platform/x86/dell-smbios.h
+++ b/drivers/platform/x86/dell-smbios.h
@@ -40,7 +40,7 @@ extern struct calling_interface_token *da_tokens;
void dell_smbios_clear_buffer(void);
void dell_smbios_get_buffer(void);
-void release_buffer(void);
+void dell_smbios_release_buffer(void);
int find_token_id(int tokenid);
int find_token_location(int tokenid);
--
1.7.10.4
next prev parent reply other threads:[~2016-01-12 14:03 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-12 14:02 [PATCH 00/14] Common Dell SMBIOS API Michał Kępień
2016-01-12 14:02 ` [PATCH 01/14] dell-laptop: extract SMBIOS-related code to a separate module Michał Kępień
2016-01-16 15:19 ` Pali Rohár
2016-01-18 10:34 ` Michał Kępień
2016-01-20 9:21 ` Michał Kępień
2016-01-21 8:35 ` Pali Rohár
2016-01-21 13:06 ` Michał Kępień
2016-01-21 13:14 ` Pali Rohár
2016-01-21 13:39 ` Michał Kępień
2016-02-08 21:42 ` Darren Hart
2016-02-09 8:33 ` Pali Rohár
2016-02-09 13:58 ` Michał Kępień
2016-02-09 16:51 ` Darren Hart
2016-02-09 19:12 ` Pali Rohár
2016-02-10 23:03 ` Darren Hart
2016-01-12 14:02 ` [PATCH 02/14] dell-smbios: don't pass a buffer to dell_send_request() Michał Kępień
2016-01-12 14:02 ` [PATCH 03/14] dell-smbios: rename buffer to dell_smbios_buffer Michał Kępień
2016-01-12 14:02 ` [PATCH 04/14] dell-smbios: rename clear_buffer() to dell_smbios_clear_buffer() Michał Kępień
2016-01-12 14:02 ` [PATCH 05/14] dell-smbios: rename get_buffer() to dell_smbios_get_buffer() Michał Kępień
2016-01-12 14:02 ` Michał Kępień [this message]
2016-01-12 14:02 ` [PATCH 07/14] dell-smbios: rename dell_send_request() to dell_smbios_send_request() Michał Kępień
2016-01-12 14:02 ` [PATCH 08/14] dell-smbios: implement new function for finding DMI table 0xDA tokens Michał Kępień
2016-01-12 14:02 ` [PATCH 09/14] dell-laptop: use dell_smbios_find_token() instead of find_token_id() Michał Kępień
2016-01-12 14:02 ` [PATCH 10/14] dell-laptop: use dell_smbios_find_token() instead of find_token_location() Michał Kępień
2016-01-12 14:02 ` [PATCH 11/14] dell-smbios: remove find_token_{id,location}() Michał Kępień
2016-01-12 14:02 ` [PATCH 12/14] dell-smbios: make da_tokens static Michał Kępień
2016-01-12 14:02 ` [PATCH 13/14] dell-led: use dell_smbios_find_token() for finding mic DMI tokens Michał Kępień
2016-01-21 10:52 ` Jacek Anaszewski
2016-01-21 15:00 ` Michał Kępień
2016-01-21 15:42 ` Jacek Anaszewski
2016-01-12 14:03 ` [PATCH 14/14] dell-led: use dell_smbios_send_request() for SMBIOS requests Michał Kępień
2016-01-14 22:43 ` [PATCH 00/14] Common Dell SMBIOS API 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=1452607380-20861-7-git-send-email-kernel@kempniu.pl \
--to=kernel@kempniu.pl \
--cc=alex.hung@canonical.com \
--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).