From patchwork Wed Oct 26 19:05:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 79530 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp227987qge; Wed, 26 Oct 2016 12:07:56 -0700 (PDT) X-Received: by 10.99.192.69 with SMTP id z5mr503295pgi.169.1477508876732; Wed, 26 Oct 2016 12:07:56 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id e5si3441211paq.284.2016.10.26.12.07.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Oct 2016 12:07:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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 475851A1F58; Wed, 26 Oct 2016 12:06:26 -0700 (PDT) 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 283CF1A1F52 for ; Wed, 26 Oct 2016 12:06:24 -0700 (PDT) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (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 B534AC05A291; Wed, 26 Oct 2016 19:06:23 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-27.phx2.redhat.com [10.3.116.27]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9QJ570L025834; Wed, 26 Oct 2016 15:06:22 -0400 From: Laszlo Ersek To: edk2-devel-01 Date: Wed, 26 Oct 2016 21:05:02 +0200 Message-Id: <20161026190504.9888-46-lersek@redhat.com> In-Reply-To: <20161026190504.9888-1-lersek@redhat.com> References: <20161026190504.9888-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 26 Oct 2016 19:06:23 +0000 (UTC) Subject: [edk2] [PATCH 45/47] Vlv2TbltDevicePkg/PlatformPei: rebase to ARRAY_SIZE() 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: Tim He , David Wei MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Cc: David Wei Cc: Tim He Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- Vlv2TbltDevicePkg/PlatformPei/BootMode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.9.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Vlv2TbltDevicePkg/PlatformPei/BootMode.c b/Vlv2TbltDevicePkg/PlatformPei/BootMode.c index 4d933a09db0e..95be1c0f2851 100644 --- a/Vlv2TbltDevicePkg/PlatformPei/BootMode.c +++ b/Vlv2TbltDevicePkg/PlatformPei/BootMode.c @@ -372,13 +372,13 @@ PrioritizeBootMode ( // Find the position of the current boot mode in our priority array // for ( CurrentIndex = 0; - CurrentIndex < sizeof (mBootModePriority) / sizeof (mBootModePriority[0]); + CurrentIndex < ARRAY_SIZE (mBootModePriority); CurrentIndex++) { if (mBootModePriority[CurrentIndex] == *CurrentBootMode) { break; } } - if (CurrentIndex >= sizeof (mBootModePriority) / sizeof (mBootModePriority[0])) { + if (CurrentIndex >= ARRAY_SIZE (mBootModePriority)) { return EFI_NOT_FOUND; } @@ -386,7 +386,7 @@ PrioritizeBootMode ( // Find the position of the new boot mode in our priority array // for ( NewIndex = 0; - NewIndex < sizeof (mBootModePriority) / sizeof (mBootModePriority[0]); + NewIndex < ARRAY_SIZE (mBootModePriority); NewIndex++) { if (mBootModePriority[NewIndex] == NewBootMode) { //