Skip to content

Commit

Permalink
dell-smbios: rename release_buffer() to dell_smbios_release_buffer()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michał Kępień authored and Darren Hart committed Mar 23, 2016
1 parent b6aa7e1 commit cb16176
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
28 changes: 14 additions & 14 deletions drivers/platform/x86/dell-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions drivers/platform/x86/dell-smbios.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
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 @@ -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);
Expand Down

0 comments on commit cb16176

Please sign in to comment.