| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1452607380-20861-7-git-send-email-kernel@kempniu.pl>
Date: Tue, 12 Jan 2016 15:02:52 +0100
From: Michał Kępień <kernel@...pniu.pl>
To: Darren Hart <dvhart@...radead.org>,
Matthew Garrett <mjg59@...f.ucam.org>,
Pali Rohár <pali.rohar@...il.com>,
Richard Purdie <rpurdie@...ys.net>,
Jacek Anaszewski <j.anaszewski@...sung.com>
Cc: Alex Hung <alex.hung@...onical.com>,
platform-driver-x86@...r.kernel.org, linux-leds@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH 06/14] dell-smbios: rename release_buffer() to dell_smbios_release_buffer()
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@...pniu.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
Powered by blists - more mailing lists