summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorMichał Kępień <kernel@kempniu.pl>2016-03-04 14:09:07 +0100
committerDarren Hart <dvhart@linux.intel.com>2016-03-23 18:05:49 +0100
commit0db2180fce6ada548f03c4f456ba2113753cdba9 (patch)
treeac24ed1de060a47077c9e88a361789e6ad829ecc /drivers/platform
parentdell-laptop: move dell_smi_error() to dell-smbios (diff)
downloadlinux-0db2180fce6ada548f03c4f456ba2113753cdba9.tar.xz
linux-0db2180fce6ada548f03c4f456ba2113753cdba9.zip
dell-smbios: rename dell_smi_error() to dell_smbios_error()
As dell_smi_error() is exported by dell-smbios, its prefix should be consistent with other exported symbols, so change function name to dell_smbios_error(). 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/platform')
-rw-r--r--drivers/platform/x86/dell-laptop.c16
-rw-r--r--drivers/platform/x86/dell-smbios.c4
-rw-r--r--drivers/platform/x86/dell-smbios.h2
3 files changed, 11 insertions, 11 deletions
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index cbafb95f694c..2c2f02b2e08a 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -433,7 +433,7 @@ static int dell_rfkill_set(void *data, bool blocked)
out:
dell_smbios_release_buffer();
- return dell_smi_error(ret);
+ return dell_smbios_error(ret);
}
/* Must be called with the buffer held */
@@ -876,7 +876,7 @@ static int dell_send_intensity(struct backlight_device *bd)
else
dell_smbios_send_request(1, 1);
- ret = dell_smi_error(buffer->output[0]);
+ ret = dell_smbios_error(buffer->output[0]);
dell_smbios_release_buffer();
return ret;
@@ -901,7 +901,7 @@ static int dell_get_intensity(struct backlight_device *bd)
dell_smbios_send_request(0, 1);
if (buffer->output[0])
- ret = dell_smi_error(buffer->output[0]);
+ ret = dell_smbios_error(buffer->output[0]);
else
ret = buffer->output[1];
@@ -1160,7 +1160,7 @@ static int kbd_get_info(struct kbd_info *info)
ret = buffer->output[0];
if (ret) {
- ret = dell_smi_error(ret);
+ ret = dell_smbios_error(ret);
goto out;
}
@@ -1249,7 +1249,7 @@ static int kbd_get_state(struct kbd_state *state)
ret = buffer->output[0];
if (ret) {
- ret = dell_smi_error(ret);
+ ret = dell_smbios_error(ret);
goto out;
}
@@ -1286,7 +1286,7 @@ static int kbd_set_state(struct kbd_state *state)
ret = buffer->output[0];
dell_smbios_release_buffer();
- return dell_smi_error(ret);
+ return dell_smbios_error(ret);
}
static int kbd_set_state_safe(struct kbd_state *state, struct kbd_state *old)
@@ -1329,7 +1329,7 @@ static int kbd_set_token_bit(u8 bit)
ret = buffer->output[0];
dell_smbios_release_buffer();
- return dell_smi_error(ret);
+ return dell_smbios_error(ret);
}
static int kbd_get_token_bit(u8 bit)
@@ -1354,7 +1354,7 @@ static int kbd_get_token_bit(u8 bit)
dell_smbios_release_buffer();
if (ret)
- return dell_smi_error(ret);
+ return dell_smbios_error(ret);
return (val == token->value);
}
diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c
index 942572f183b5..d2412ab097da 100644
--- a/drivers/platform/x86/dell-smbios.c
+++ b/drivers/platform/x86/dell-smbios.c
@@ -40,7 +40,7 @@ static int da_command_code;
static int da_num_tokens;
static struct calling_interface_token *da_tokens;
-int dell_smi_error(int value)
+int dell_smbios_error(int value)
{
switch (value) {
case 0: /* Completed successfully */
@@ -53,7 +53,7 @@ int dell_smi_error(int value)
return -EINVAL;
}
}
-EXPORT_SYMBOL_GPL(dell_smi_error);
+EXPORT_SYMBOL_GPL(dell_smbios_error);
struct calling_interface_buffer *dell_smbios_get_buffer(void)
{
diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h
index 52febe62d189..ec7d40ae5e6e 100644
--- a/drivers/platform/x86/dell-smbios.h
+++ b/drivers/platform/x86/dell-smbios.h
@@ -35,7 +35,7 @@ struct calling_interface_token {
};
};
-int dell_smi_error(int value);
+int dell_smbios_error(int value);
struct calling_interface_buffer *dell_smbios_get_buffer(void);
void dell_smbios_clear_buffer(void);