From patchwork Tue Feb 16 14:50:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 8327401 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 522879F38B for ; Tue, 16 Feb 2016 14:53:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6DD5220259 for ; Tue, 16 Feb 2016 14:53:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C0CE201C8 for ; Tue, 16 Feb 2016 14:53:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755218AbcBPOw4 (ORCPT ); Tue, 16 Feb 2016 09:52:56 -0500 Received: from mail-lf0-f52.google.com ([209.85.215.52]:34679 "EHLO mail-lf0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755262AbcBPOu5 (ORCPT ); Tue, 16 Feb 2016 09:50:57 -0500 Received: by mail-lf0-f52.google.com with SMTP id j78so110197896lfb.1 for ; Tue, 16 Feb 2016 06:50:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=e0iQ6/bjrdsnXK7BHrbFE78GjiXGPJk8aBw4fE10X6A=; b=HcHGOQsJMmImhWeDMq7JeD6CnUAKE5UyPQRZGAD4M5Y7MTf/Guas06eBST/dzm5gGl 3WmwDfnK7dvYyBfrgikcJVUptb6L3maxNbw+3wNbBs4LGOOE28NMAoFCXylzQCwTqqc0 2mFw+3EuW2Lyfgp+YIuQPxTu3LHd3MDBUMqEU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=e0iQ6/bjrdsnXK7BHrbFE78GjiXGPJk8aBw4fE10X6A=; b=WDfVAMDX3E51Emv9FeIlIkyJNKmLz7gJDCSAc6x6+7TCCv+mWcgIAod+Zwqsg7VDrb VbijBezw1mLHpBlV92T5ZhBh0nHZblYMilhhjtRcKD1fag/i9Cc2BRPiGn4NH+hz93rR GsaoOUTwdgvB+0zjSTYoUbr3ej1SkSaFI7IWRF7wn3aIrz1bjNjilzZwxsMiu3IzGMS4 WAJqSx6wXpSngLIcVvFm0SzwCeIg8rCMx9axAX7v+oq0fady6qKLNXe3db+uxhRk00qa nvifg2dg+10OvGxD2JAcXorDx5KWsYoyNaeNyxWnFaqhtmvyattO5c8UD/VVOWI3/8JE Rf3Q== X-Gm-Message-State: AG10YOT+a2UE/Ffw6SzisQJh3j+nndMYRxA/MOR+bxFWNm9rcXPJ+rgISWrfilxdXRWfaw== X-Received: by 10.25.31.80 with SMTP id f77mr8647232lff.18.1455634256087; Tue, 16 Feb 2016 06:50:56 -0800 (PST) Received: from eudyptula.hq.kempniu.pl. (eudyptula.hq.kempniu.pl. [2001:6a0:200:83b0::fd5a]) by smtp.googlemail.com with ESMTPSA id v140sm4458684lfd.24.2016.02.16.06.50.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Feb 2016 06:50:54 -0800 (PST) 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 v3 2/5] dell-smbios: rename dell_smi_error() to dell_smbios_error() Date: Tue, 16 Feb 2016 15:50:27 +0100 Message-Id: <1455634230-1487-3-git-send-email-kernel@kempniu.pl> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1455634230-1487-1-git-send-email-kernel@kempniu.pl> References: <20160121090401.GR7192@pali> <1455634230-1487-1-git-send-email-kernel@kempniu.pl> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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);