openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

dell-smbios: rename get_buffer() to dell_smbios_get_buffer() 

As get_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>
This commit is contained in:
Michał Kępień 2016-01-22 15:27:14 +01:00 committed by Darren Hart
parent 2f9f26bd86
commit ee83c47541
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/platform/x86/dell-laptop.c
View File

@ -416,7 +416,7 @@ static int dell_rfkill_set(void *data, bool blocked)
int status;
int ret;
get_buffer();
dell_smbios_get_buffer();
dell_send_request(buffer, 17, 11);
ret = buffer->output[0];
@ -479,7 +479,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data)
int status;
int ret;
get_buffer();
dell_smbios_get_buffer();
dell_send_request(buffer, 17, 11);
ret = buffer->output[0];
@ -519,7 +519,7 @@ static int dell_debugfs_show(struct seq_file *s, void *data)
int status;
int ret;
get_buffer();
dell_smbios_get_buffer();
dell_send_request(buffer, 17, 11);
ret = buffer->output[0];
@ -617,7 +617,7 @@ static void dell_update_rfkill(struct work_struct *ignored)
int status;
int ret;
get_buffer();
dell_smbios_get_buffer();
dell_send_request(buffer, 17, 11);
ret = buffer->output[0];
@ -709,7 +709,7 @@ static int __init dell_setup_rfkill(void)
if (!force_rfkill && !whitelisted)
return 0;
get_buffer();
dell_smbios_get_buffer();
dell_send_request(buffer, 17, 11);
ret = buffer->output[0];
status = buffer->output[1];
@ -873,7 +873,7 @@ static int dell_send_intensity(struct backlight_device *bd)
if (token == -1)
return -ENODEV;
get_buffer();
dell_smbios_get_buffer();
buffer->input[0] = token;
buffer->input[1] = bd->props.brightness;
@ -897,7 +897,7 @@ static int dell_get_intensity(struct backlight_device *bd)
if (token == -1)
return -ENODEV;
get_buffer();
dell_smbios_get_buffer();
buffer->input[0] = token;
if (power_supply_is_system_supplied() > 0)
@ -1157,7 +1157,7 @@ static int kbd_get_info(struct kbd_info *info)
u8 units;
int ret;
get_buffer();
dell_smbios_get_buffer();
buffer->input[0] = 0x0;
dell_send_request(buffer, 4, 11);
@ -1245,7 +1245,7 @@ static int kbd_get_state(struct kbd_state *state)
{
int ret;
get_buffer();
dell_smbios_get_buffer();
buffer->input[0] = 0x1;
dell_send_request(buffer, 4, 11);
@ -1276,7 +1276,7 @@ static int kbd_set_state(struct kbd_state *state)
{
int ret;
get_buffer();
dell_smbios_get_buffer();
buffer->input[0] = 0x2;
buffer->input[1] = BIT(state->mode_bit) & 0xFFFF;
buffer->input[1] |= (state->triggers & 0xFF) << 16;
@ -1323,7 +1323,7 @@ static int kbd_set_token_bit(u8 bit)
if (id == -1)
return -EINVAL;
get_buffer();
dell_smbios_get_buffer();
buffer->input[0] = da_tokens[id].location;
buffer->input[1] = da_tokens[id].value;
dell_send_request(buffer, 1, 0);
@ -1346,7 +1346,7 @@ static int kbd_get_token_bit(u8 bit)
if (id == -1)
return -EINVAL;
get_buffer();
dell_smbios_get_buffer();
buffer->input[0] = da_tokens[id].location;
dell_send_request(buffer, 0, 0);
ret = buffer->output[0];
@ -2017,7 +2017,7 @@ static int __init dell_init(void)
token = find_token_location(BRIGHTNESS_TOKEN);
if (token != -1) {
get_buffer();
dell_smbios_get_buffer();
buffer->input[0] = token;
dell_send_request(buffer, 0, 2);
if (buffer->output[0] == 0)

4
drivers/platform/x86/dell-smbios.c
View File

@ -41,12 +41,12 @@ static int da_num_tokens;
struct calling_interface_token *da_tokens;
EXPORT_SYMBOL_GPL(da_tokens);
void get_buffer(void)
void dell_smbios_get_buffer(void)
{
mutex_lock(&buffer_mutex);
clear_buffer();
}
EXPORT_SYMBOL_GPL(get_buffer);
EXPORT_SYMBOL_GPL(dell_smbios_get_buffer);
void clear_buffer(void)
{

2
drivers/platform/x86/dell-smbios.h
View File

@ -38,7 +38,7 @@ struct calling_interface_token {
extern struct calling_interface_buffer *buffer;
extern struct calling_interface_token *da_tokens;
void get_buffer(void);
void dell_smbios_get_buffer(void);
void clear_buffer(void);
void release_buffer(void);
struct calling_interface_buffer *