From patchwork Fri Dec 2 20:20:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 86357 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp428985qgi; Fri, 2 Dec 2016 12:21:09 -0800 (PST) X-Received: by 10.84.179.165 with SMTP id b34mr100045059plc.162.1480710069879; Fri, 02 Dec 2016 12:21:09 -0800 (PST) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id p70si6370657pfd.221.2016.12.02.12.21.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Dec 2016 12:21:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9602581F61; Fri, 2 Dec 2016 12:21:09 -0800 (PST) X-Original-To: edk2-devel@ml01.01.org Delivered-To: edk2-devel@ml01.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 28CCD81F5E for ; Fri, 2 Dec 2016 12:21:09 -0800 (PST) Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 938A537E72; Fri, 2 Dec 2016 20:21:08 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-87.phx2.redhat.com [10.3.116.87]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB2KL4BE010188; Fri, 2 Dec 2016 15:21:07 -0500 From: Laszlo Ersek To: edk2-devel-01 Date: Fri, 2 Dec 2016 21:20:54 +0100 Message-Id: <20161202202059.5061-2-lersek@redhat.com> In-Reply-To: <20161202202059.5061-1-lersek@redhat.com> References: <20161202202059.5061-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 02 Dec 2016 20:21:08 +0000 (UTC) Subject: [edk2] [PATCH v2 1/6] ArmVirtPkg/QemuFwCfgLib: remove superfluous InternalQemuFwCfgIsAvailable() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leif Lindholm , Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" InternalQemuFwCfgIsAvailable() is an API that is incorrectly exposed by the "OvmfPkg/Include/Library/QemuFwCfgLib.h" library class header; the API is meant to be used internally to library instances (if it's needed at all). ArmVirtPkg's instance has no use for it actually, so simplify the code and remove the function definition. Cc: Ard Biesheuvel Cc: Leif Lindholm Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: Jordan Justen Reviewed-by: Leif Lindholm --- ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 31 ++++---------------- 1 file changed, 6 insertions(+), 25 deletions(-) -- 2.9.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c index 8ecbe3fb5fe6..2fd8d9050566 100644 --- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c +++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c @@ -75,25 +75,6 @@ typedef struct { /** - Returns a boolean indicating if the firmware configuration interface is - available for library-internal purposes. - - This function never changes fw_cfg state. - - @retval TRUE The interface is available internally. - @retval FALSE The interface is not available internally. -**/ -BOOLEAN -EFIAPI -InternalQemuFwCfgIsAvailable ( - VOID - ) -{ - return (BOOLEAN)(mFwCfgSelectorAddress != 0 && mFwCfgDataAddress != 0); -} - - -/** Returns a boolean indicating if the firmware configuration interface is available or not. @@ -109,7 +90,7 @@ QemuFwCfgIsAvailable ( VOID ) { - return InternalQemuFwCfgIsAvailable (); + return (BOOLEAN)(mFwCfgSelectorAddress != 0 && mFwCfgDataAddress != 0); } @@ -187,7 +168,7 @@ QemuFwCfgInitialize ( FwCfgDmaAddress = 0; } - if (InternalQemuFwCfgIsAvailable ()) { + if (QemuFwCfgIsAvailable ()) { UINT32 Signature; QemuFwCfgSelectItem (QemuFwCfgItemSignature); @@ -231,7 +212,7 @@ QemuFwCfgSelectItem ( IN FIRMWARE_CONFIG_ITEM QemuFwCfgItem ) { - if (InternalQemuFwCfgIsAvailable ()) { + if (QemuFwCfgIsAvailable ()) { MmioWrite16 (mFwCfgSelectorAddress, SwapBytes16 ((UINT16)QemuFwCfgItem)); } } @@ -360,7 +341,7 @@ QemuFwCfgReadBytes ( IN VOID *Buffer ) { - if (InternalQemuFwCfgIsAvailable ()) { + if (QemuFwCfgIsAvailable ()) { InternalQemuFwCfgReadBytes (Size, Buffer); } else { ZeroMem (Buffer, Size); @@ -384,7 +365,7 @@ QemuFwCfgWriteBytes ( IN VOID *Buffer ) { - if (InternalQemuFwCfgIsAvailable ()) { + if (QemuFwCfgIsAvailable ()) { UINTN Idx; for (Idx = 0; Idx < Size; ++Idx) { @@ -494,7 +475,7 @@ QemuFwCfgFindFile ( UINT32 Count; UINT32 Idx; - if (!InternalQemuFwCfgIsAvailable ()) { + if (!QemuFwCfgIsAvailable ()) { return RETURN_UNSUPPORTED; }