diff options
author | Michał Kępień <kernel@kempniu.pl> | 2016-01-22 15:27:16 +0100 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2016-03-23 10:05:39 -0700 |
commit | cb16176380cca991dba162952941ad04ae760d0e (patch) | |
tree | 7347a69919584001e5cc94f83d108f2bcfc52e5f /drivers | |
parent | b6aa7e1817a35b93550283707dc93c98d41813eb (diff) |
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@kempniu.pl>
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/platform/x86/dell-laptop.c | 28 | ||||
-rw-r--r-- | drivers/platform/x86/dell-smbios.c | 4 | ||||
-rw-r--r-- | 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 90d75cecb984..b47dc5a893ad 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 = buffer->output[0]; out: - release_buffer(); + dell_smbios_release_buffer(); return dell_smi_error(ret); } @@ -486,7 +486,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data) status = buffer->output[1]; if (ret != 0 || !(status & BIT(0))) { - release_buffer(); + dell_smbios_release_buffer(); return; } @@ -497,7 +497,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data) ret = buffer->output[0]; hwswitch = buffer->output[1]; - release_buffer(); + dell_smbios_release_buffer(); if (ret != 0) return; @@ -532,7 +532,7 @@ static int dell_debugfs_show(struct seq_file *s, void *data) hwswitch_ret = buffer->output[0]; hwswitch_state = 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); @@ -650,7 +650,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); @@ -713,7 +713,7 @@ static int __init dell_setup_rfkill(void) dell_send_request(buffer, 17, 11); ret = buffer->output[0]; status = buffer->output[1]; - release_buffer(); + dell_smbios_release_buffer(); /* dell wireless info smbios call is not supported */ if (ret != 0) @@ -884,7 +884,7 @@ static int dell_send_intensity(struct backlight_device *bd) ret = dell_smi_error(buffer->output[0]); - release_buffer(); + dell_smbios_release_buffer(); return ret; } @@ -910,7 +910,7 @@ static int dell_get_intensity(struct backlight_device *bd) else ret = buffer->output[1]; - release_buffer(); + dell_smbios_release_buffer(); return ret; } @@ -1184,7 +1184,7 @@ static int kbd_get_info(struct kbd_info *info) info->days = (buffer->output[3] >> 24) & 0xFF; out: - release_buffer(); + dell_smbios_release_buffer(); return ret; } @@ -1268,7 +1268,7 @@ static int kbd_get_state(struct kbd_state *state) state->level = (buffer->output[2] >> 16) & 0xFF; out: - release_buffer(); + dell_smbios_release_buffer(); return ret; } @@ -1286,7 +1286,7 @@ static int kbd_set_state(struct kbd_state *state) buffer->input[2] |= (state->level & 0xFF) << 16; dell_send_request(buffer, 4, 11); ret = buffer->output[0]; - release_buffer(); + dell_smbios_release_buffer(); return dell_smi_error(ret); } @@ -1328,7 +1328,7 @@ static int kbd_set_token_bit(u8 bit) buffer->input[1] = da_tokens[id].value; dell_send_request(buffer, 1, 0); ret = buffer->output[0]; - release_buffer(); + dell_smbios_release_buffer(); return dell_smi_error(ret); } @@ -1351,7 +1351,7 @@ static int kbd_get_token_bit(u8 bit) dell_send_request(buffer, 0, 0); ret = buffer->output[0]; val = buffer->output[1]; - release_buffer(); + dell_smbios_release_buffer(); if (ret) return dell_smi_error(ret); @@ -2022,7 +2022,7 @@ static int __init dell_init(void) dell_send_request(buffer, 0, 2); if (buffer->output[0] == 0) max_intensity = 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 2fcdfafb52ba..194505b7f07a 100644 --- a/drivers/platform/x86/dell-smbios.c +++ b/drivers/platform/x86/dell-smbios.c @@ -54,11 +54,11 @@ void dell_smbios_clear_buffer(void) } EXPORT_SYMBOL_GPL(dell_smbios_clear_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); struct calling_interface_buffer * dell_send_request(struct calling_interface_buffer *buffer, diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h index c5e94742505b..85581037a547 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_get_buffer(void); void dell_smbios_clear_buffer(void); -void release_buffer(void); +void dell_smbios_release_buffer(void); struct calling_interface_buffer * dell_send_request(struct calling_interface_buffer *buffer, int class, int select); |