From patchwork Wed Feb 24 07:20:11 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: 8402341 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7DD16C0553 for ; Wed, 24 Feb 2016 07:20:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 919DA2034E for ; Wed, 24 Feb 2016 07:20:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E6D3202E9 for ; Wed, 24 Feb 2016 07:20:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757388AbcBXHTd (ORCPT ); Wed, 24 Feb 2016 02:19:33 -0500 Received: from mail-wm0-f42.google.com ([74.125.82.42]:38285 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756743AbcBXHTb (ORCPT ); Wed, 24 Feb 2016 02:19:31 -0500 Received: by mail-wm0-f42.google.com with SMTP id a4so16206154wme.1 for ; Tue, 23 Feb 2016 23:19:31 -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=voGPaqYY2KiiCAuqBAAB9RHaVsM75C+kyrFlTjKITyk=; b=OTl2sP3z7N+sldfug2d/RqhIm3BfsMoKtXJwlC5RfCiJk1iBTb4bCDKr47EZOP/bu5 ruhra+K4bh+aKakGRawwyJjKcO7TuJTZtTYGzj+lHpPMCzto/x6YlA6D6KQNQ5lRZlC6 yoVaXNStrz6dT2WwNJAdFeioTz2uE9UUW5+VI= 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=voGPaqYY2KiiCAuqBAAB9RHaVsM75C+kyrFlTjKITyk=; b=hxEZiKKm3nn700k0CQTC5dvB/SzeMmkfNY5zi+5+rRH4rzCdKaYoXZ6Qvn96+6oNBb 1F7Gknu3CZBu5wU74lAdUJuZGl2m+4HtYcrtIC+JaAwZCh1m/5yrfGNstAbfSRpMFj05 Z7YI381vuNtqZ2AOmorqIDZh4bmpzvjebFk0wej96g0j3ssQxWbYT+QLvP00i+n2i4DY cvKLKEGq4dz1g1oro8V4mNjm9G3IChIifnJUYaBWvxuMlXr7kmLI7gLFkIPO0VsRLr2i lS6Aa6JFKjdEYKiVr2ERKU5LkB5zBXhUrWpmQVkNqQK31ccTMqYSjr8pTlGHG4pf5UFS dCxQ== X-Gm-Message-State: AG10YOQRSWeUO5pduuYESNgTQff+DrjlUGenw+zPuUmmxBAf4HGto6efr5VdgXUZZv4lDA== X-Received: by 10.28.126.65 with SMTP id z62mr23589407wmc.3.1456298370539; Tue, 23 Feb 2016 23:19:30 -0800 (PST) Received: from eudyptula.hq.kempniu.pl. (eudyptula.hq.kempniu.pl. [2001:6a0:200:83b0::fd5a]) by smtp.googlemail.com with ESMTPSA id a128sm1981540wmh.6.2016.02.23.23.19.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Feb 2016 23:19:29 -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 v4 1/5] dell-laptop: move dell_smi_error() to dell-smbios Date: Wed, 24 Feb 2016 08:20:11 +0100 Message-Id: <1456298416-29683-2-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 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 The dell_smi_error() method could be used by modules other than dell-laptop for convenient translation of SMBIOS request errors into errno values. Thus, move it to dell-smbios. Signed-off-by: Micha? K?pie? --- drivers/platform/x86/dell-laptop.c | 14 -------------- drivers/platform/x86/dell-smbios.c | 16 ++++++++++++++++ drivers/platform/x86/dell-smbios.h | 2 ++ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index 76064c8..cbafb95 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -273,20 +273,6 @@ static const struct dmi_system_id dell_quirks[] __initconst = { { } }; -static inline int dell_smi_error(int value) -{ - switch (value) { - case 0: /* Completed successfully */ - return 0; - case -1: /* Completed with error */ - return -EIO; - case -2: /* Function not supported */ - return -ENXIO; - default: /* Unknown error */ - return -EINVAL; - } -} - /* * Derived from information in smbios-wireless-ctl: * diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c index 2a4992a..942572f 100644 --- a/drivers/platform/x86/dell-smbios.c +++ b/drivers/platform/x86/dell-smbios.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -39,6 +40,21 @@ static int da_command_code; static int da_num_tokens; static struct calling_interface_token *da_tokens; +int dell_smi_error(int value) +{ + switch (value) { + case 0: /* Completed successfully */ + return 0; + case -1: /* Completed with error */ + return -EIO; + case -2: /* Function not supported */ + return -ENXIO; + default: /* Unknown error */ + return -EINVAL; + } +} +EXPORT_SYMBOL_GPL(dell_smi_error); + struct calling_interface_buffer *dell_smbios_get_buffer(void) { mutex_lock(&buffer_mutex); diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h index 4f69b16..52febe6 100644 --- a/drivers/platform/x86/dell-smbios.h +++ b/drivers/platform/x86/dell-smbios.h @@ -35,6 +35,8 @@ struct calling_interface_token { }; }; +int dell_smi_error(int value); + struct calling_interface_buffer *dell_smbios_get_buffer(void); void dell_smbios_clear_buffer(void); void dell_smbios_release_buffer(void);