diff options
| author | Michał Kępień | 2016-01-22 15:27:15 +0100 |
|---|---|---|
| committer | Darren Hart | 2016-03-23 10:05:38 -0700 |
| commit | b6aa7e1817a35b93550283707dc93c98d41813eb (patch) | |
| tree | b453732a24cbe89901e1bbe50bb8548a7701b1f9 | |
| parent | ee83c475415edd48b0739bee230b75454b82199e (diff) | |
dell-smbios: rename clear_buffer() to dell_smbios_clear_buffer()
As clear_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>
| -rw-r--r-- | drivers/platform/x86/dell-laptop.c | 12 | ||||
| -rw-r--r-- | drivers/platform/x86/dell-smbios.c | 6 | ||||
| -rw-r--r-- | drivers/platform/x86/dell-smbios.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index 575b0dfa4d37..90d75cecb984 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -425,7 +425,7 @@ static int dell_rfkill_set(void *data, bool blocked) if (ret != 0) goto out; - clear_buffer(); + dell_smbios_clear_buffer(); buffer->input[0] = 0x2; dell_send_request(buffer, 17, 11); @@ -438,7 +438,7 @@ static int dell_rfkill_set(void *data, bool blocked) (status & BIT(0)) && !(status & BIT(16))) disable = 1; - clear_buffer(); + dell_smbios_clear_buffer(); buffer->input[0] = (1 | (radio<<8) | (disable << 16)); dell_send_request(buffer, 17, 11); @@ -456,7 +456,7 @@ static void dell_rfkill_update_sw_state(struct rfkill *rfkill, int radio, if (status & BIT(0)) { /* Has hw-switch, sync sw_state to BIOS */ int block = rfkill_blocked(rfkill); - clear_buffer(); + dell_smbios_clear_buffer(); buffer->input[0] = (1 | (radio << 8) | (block << 16)); dell_send_request(buffer, 17, 11); } else { @@ -490,7 +490,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data) return; } - clear_buffer(); + dell_smbios_clear_buffer(); buffer->input[0] = 0x2; dell_send_request(buffer, 17, 11); @@ -525,7 +525,7 @@ static int dell_debugfs_show(struct seq_file *s, void *data) ret = buffer->output[0]; status = buffer->output[1]; - clear_buffer(); + dell_smbios_clear_buffer(); buffer->input[0] = 0x2; dell_send_request(buffer, 17, 11); @@ -626,7 +626,7 @@ static void dell_update_rfkill(struct work_struct *ignored) if (ret != 0) goto out; - clear_buffer(); + dell_smbios_clear_buffer(); buffer->input[0] = 0x2; dell_send_request(buffer, 17, 11); diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c index 584443187ca6..2fcdfafb52ba 100644 --- a/drivers/platform/x86/dell-smbios.c +++ b/drivers/platform/x86/dell-smbios.c @@ -44,15 +44,15 @@ EXPORT_SYMBOL_GPL(da_tokens); void dell_smbios_get_buffer(void) { mutex_lock(&buffer_mutex); - clear_buffer(); + dell_smbios_clear_buffer(); } EXPORT_SYMBOL_GPL(dell_smbios_get_buffer); -void clear_buffer(void) +void dell_smbios_clear_buffer(void) { memset(buffer, 0, sizeof(struct calling_interface_buffer)); } -EXPORT_SYMBOL_GPL(clear_buffer); +EXPORT_SYMBOL_GPL(dell_smbios_clear_buffer); void release_buffer(void) { diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h index ace16c128a77..c5e94742505b 100644 --- a/drivers/platform/x86/dell-smbios.h +++ b/drivers/platform/x86/dell-smbios.h @@ -39,7 +39,7 @@ extern struct calling_interface_buffer *buffer; extern struct calling_interface_token *da_tokens; void dell_smbios_get_buffer(void); -void clear_buffer(void); +void dell_smbios_clear_buffer(void); void release_buffer(void); struct calling_interface_buffer * dell_send_request(struct calling_interface_buffer *buffer, |