From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932124AbcBXHUx (ORCPT ); Wed, 24 Feb 2016 02:20:53 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:36200 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757338AbcBXHTd (ORCPT ); Wed, 24 Feb 2016 02:19:33 -0500 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Matthew Garrett , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Darren Hart Cc: Darek Stojaczyk , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/5] dell-smbios: rename dell_smi_error() to dell_smbios_error() Date: Wed, 24 Feb 2016 08:20:12 +0100 Message-Id: <1456298416-29683-3-git-send-email-kernel@kempniu.pl> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1456298416-29683-1-git-send-email-kernel@kempniu.pl> References: <1455634230-1487-1-git-send-email-kernel@kempniu.pl> <1456298416-29683-1-git-send-email-kernel@kempniu.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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ń --- drivers/platform/x86/dell-laptop.c | 16 ++++++++-------- drivers/platform/x86/dell-smbios.c | 4 ++-- drivers/platform/x86/dell-smbios.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index cbafb95..2c2f02b 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 942572f..d2412ab 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 52febe6..ec7d40a 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); -- 1.7.10.4