aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Kępień <kernel@kempniu.pl>2016-03-04 08:09:07 -0500
committerDarren Hart <dvhart@linux.intel.com>2016-03-23 13:05:49 -0400
commit0db2180fce6ada548f03c4f456ba2113753cdba9 (patch)
treeac24ed1de060a47077c9e88a361789e6ad829ecc
parente8edf53b198f5656d5ae99685bc6c1f616662b3d (diff)
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>
-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)
433 433
434 out: 434 out:
435 dell_smbios_release_buffer(); 435 dell_smbios_release_buffer();
436 return dell_smi_error(ret); 436 return dell_smbios_error(ret);
437} 437}
438 438
439/* Must be called with the buffer held */ 439/* Must be called with the buffer held */
@@ -876,7 +876,7 @@ static int dell_send_intensity(struct backlight_device *bd)
876 else 876 else
877 dell_smbios_send_request(1, 1); 877 dell_smbios_send_request(1, 1);
878 878
879 ret = dell_smi_error(buffer->output[0]); 879 ret = dell_smbios_error(buffer->output[0]);
880 880
881 dell_smbios_release_buffer(); 881 dell_smbios_release_buffer();
882 return ret; 882 return ret;
@@ -901,7 +901,7 @@ static int dell_get_intensity(struct backlight_device *bd)
901 dell_smbios_send_request(0, 1); 901 dell_smbios_send_request(0, 1);
902 902
903 if (buffer->output[0]) 903 if (buffer->output[0])
904 ret = dell_smi_error(buffer->output[0]); 904 ret = dell_smbios_error(buffer->output[0]);
905 else 905 else
906 ret = buffer->output[1]; 906 ret = buffer->output[1];
907 907
@@ -1160,7 +1160,7 @@ static int kbd_get_info(struct kbd_info *info)
1160 ret = buffer->output[0]; 1160 ret = buffer->output[0];
1161 1161
1162 if (ret) { 1162 if (ret) {
1163 ret = dell_smi_error(ret); 1163 ret = dell_smbios_error(ret);
1164 goto out; 1164 goto out;
1165 } 1165 }
1166 1166
@@ -1249,7 +1249,7 @@ static int kbd_get_state(struct kbd_state *state)
1249 ret = buffer->output[0]; 1249 ret = buffer->output[0];
1250 1250
1251 if (ret) { 1251 if (ret) {
1252 ret = dell_smi_error(ret); 1252 ret = dell_smbios_error(ret);
1253 goto out; 1253 goto out;
1254 } 1254 }
1255 1255
@@ -1286,7 +1286,7 @@ static int kbd_set_state(struct kbd_state *state)
1286 ret = buffer->output[0]; 1286 ret = buffer->output[0];
1287 dell_smbios_release_buffer(); 1287 dell_smbios_release_buffer();
1288 1288
1289 return dell_smi_error(ret); 1289 return dell_smbios_error(ret);
1290} 1290}
1291 1291
1292static int kbd_set_state_safe(struct kbd_state *state, struct kbd_state *old) 1292static 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)
1329 ret = buffer->output[0]; 1329 ret = buffer->output[0];
1330 dell_smbios_release_buffer(); 1330 dell_smbios_release_buffer();
1331 1331
1332 return dell_smi_error(ret); 1332 return dell_smbios_error(ret);
1333} 1333}
1334 1334
1335static int kbd_get_token_bit(u8 bit) 1335static int kbd_get_token_bit(u8 bit)
@@ -1354,7 +1354,7 @@ static int kbd_get_token_bit(u8 bit)
1354 dell_smbios_release_buffer(); 1354 dell_smbios_release_buffer();
1355 1355
1356 if (ret) 1356 if (ret)
1357 return dell_smi_error(ret); 1357 return dell_smbios_error(ret);
1358 1358
1359 return (val == token->value); 1359 return (val == token->value);
1360} 1360}
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;
40static int da_num_tokens; 40static int da_num_tokens;
41static struct calling_interface_token *da_tokens; 41static struct calling_interface_token *da_tokens;
42 42
43int dell_smi_error(int value) 43int dell_smbios_error(int value)
44{ 44{
45 switch (value) { 45 switch (value) {
46 case 0: /* Completed successfully */ 46 case 0: /* Completed successfully */
@@ -53,7 +53,7 @@ int dell_smi_error(int value)
53 return -EINVAL; 53 return -EINVAL;
54 } 54 }
55} 55}
56EXPORT_SYMBOL_GPL(dell_smi_error); 56EXPORT_SYMBOL_GPL(dell_smbios_error);
57 57
58struct calling_interface_buffer *dell_smbios_get_buffer(void) 58struct calling_interface_buffer *dell_smbios_get_buffer(void)
59{ 59{
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 {
35 }; 35 };
36}; 36};
37 37
38int dell_smi_error(int value); 38int dell_smbios_error(int value);
39 39
40struct calling_interface_buffer *dell_smbios_get_buffer(void); 40struct calling_interface_buffer *dell_smbios_get_buffer(void);
41void dell_smbios_clear_buffer(void); 41void dell_smbios_clear_buffer(void);