From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 AB76C1A1EEC for ; Fri, 21 Oct 2016 14:28:03 -0700 (PDT) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 438AE83F3C; Fri, 21 Oct 2016 21:28:03 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-45.phx2.redhat.com [10.3.116.45]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9LLRegC027240; Fri, 21 Oct 2016 17:28:02 -0400 From: Laszlo Ersek To: edk2-devel-01 Cc: Ard Biesheuvel Date: Fri, 21 Oct 2016 23:27:32 +0200 Message-Id: <20161021212737.15974-15-lersek@redhat.com> In-Reply-To: <20161021212737.15974-1-lersek@redhat.com> References: <20161021212737.15974-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 21 Oct 2016 21:28:03 +0000 (UTC) Subject: [PATCH 14/19] ArmVirtPkg/ArmVirtTimerFdtClientLib: eliminate unchecked PcdSetXX() calls 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: , X-List-Received-Date: Fri, 21 Oct 2016 21:28:03 -0000 These are deprecated / disabled under the DISABLE_NEW_DEPRECATED_INTERFACES feature test macro. Introduce a variable called PcdStatus, and use it to assert the success of these operations (there is no reason for them to fail here). Cc: Ard Biesheuvel Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=165 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c index 6e7461c6b2e7..c40838632352 100644 --- a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c +++ b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c @@ -41,6 +41,7 @@ ArmVirtTimerFdtClientLibConstructor ( CONST INTERRUPT_PROPERTY *InterruptProp; UINT32 PropSize; INT32 SecIntrNum, IntrNum, VirtIntrNum, HypIntrNum; + RETURN_STATUS PcdStatus; Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL, (VOID **)&FdtClient); @@ -78,10 +79,14 @@ ArmVirtTimerFdtClientLibConstructor ( DEBUG ((EFI_D_INFO, "Found Timer interrupts %d, %d, %d, %d\n", SecIntrNum, IntrNum, VirtIntrNum, HypIntrNum)); - PcdSet32 (PcdArmArchTimerSecIntrNum, SecIntrNum); - PcdSet32 (PcdArmArchTimerIntrNum, IntrNum); - PcdSet32 (PcdArmArchTimerVirtIntrNum, VirtIntrNum); - PcdSet32 (PcdArmArchTimerHypIntrNum, HypIntrNum); + PcdStatus = PcdSet32S (PcdArmArchTimerSecIntrNum, SecIntrNum); + ASSERT_RETURN_ERROR (PcdStatus); + PcdStatus = PcdSet32S (PcdArmArchTimerIntrNum, IntrNum); + ASSERT_RETURN_ERROR (PcdStatus); + PcdStatus = PcdSet32S (PcdArmArchTimerVirtIntrNum, VirtIntrNum); + ASSERT_RETURN_ERROR (PcdStatus); + PcdStatus = PcdSet32S (PcdArmArchTimerHypIntrNum, HypIntrNum); + ASSERT_RETURN_ERROR (PcdStatus); return EFI_SUCCESS; } -- 2.9.2