Skip to content

Commit

Permalink
dell-smbios: rename clear_buffer() to dell_smbios_clear_buffer()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michał Kępień authored and Darren Hart committed Mar 23, 2016
1 parent ee83c47 commit b6aa7e1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions drivers/platform/x86/dell-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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 {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions drivers/platform/x86/dell-smbios.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion drivers/platform/x86/dell-smbios.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit b6aa7e1

Please sign in to comment.