From patchwork Fri Jan 4 11:03:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 154759 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp495557ljp; Fri, 4 Jan 2019 03:03:39 -0800 (PST) X-Google-Smtp-Source: AFSGD/VXyhrBlEWG0RTlC8YrP9PXr9b1WRCaobZX1UPZHw4Gty+JE4i/yLPUfqw/eERFmZuV/JRw X-Received: by 2002:a62:2702:: with SMTP id n2mr53149281pfn.29.1546599819121; Fri, 04 Jan 2019 03:03:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546599819; cv=none; d=google.com; s=arc-20160816; b=SU8yEO06Awb4usqGO2EFWMoRlPq31LniwfVzl6JAO8aXa5YdZdzS2pinBlw7o3PXdY mwmJQN1YZ5ohDl1m5tMwF0wbpAEVwRjzUQY8q7aEKqid1iOePhZcBxd2PXIeI6u3qF3L /Pe31oNb8irHZ7ZPKvmnStQcAYUggbCgbiKsMX7a0Z46v3bYL+LtaImmBEdvblnDpJzo GvsDc1znZXa9pIj8msrSD5hTrnKCd0CffWyZh1KjYRpIdYk3UAJYUbxvx+92YqVOaTwd ErcoeIYlRNCUhAiDc1iJ6qKs3pN5mpNrAw0b9EDXaGDPUKY3XJ94gVJjjRNl+HF/wCj5 n7Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=1gonC3IG+zIe3b3ntztYYIyaTMJaweDPNMA0BmtLh5o=; b=VcLIPBoydNQxERG/8P/yq9hK8nCTzKaSTi3MSEBkyAIM+WgyD3RAu0DFy1B6VoZpie l2rJ4jX9xQWnSO+Yqvg8PGAKFqFhkxUKF9hfsoKfBrvgW/1p9Z02XB0xKejDrw7T3AyK GOMWnA8dr6Hc9nR6jle382JnFJ8EJz/QV/Te7ebDZLWQm3z42+wVUKT6Il2AfEljmW+B fgc+AjvrtYQ4egPm8l1sl/bNF5ZjK9I2+84NVGuok7R9z+eVMa3/JEDT6Pwwee8istrC Xqxshvuicm8tuJatdorIiLy2acNU+XSm/NxUyLJJRd4d3PELjPqLR2PyV932NQKi0qk/ a7+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=T0Z6wl5D; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id t17si11934587pfh.267.2019.01.04.03.03.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Jan 2019 03:03:39 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=T0Z6wl5D; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D3E15211AE8C0; Fri, 4 Jan 2019 03:03:31 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::544; helo=mail-ed1-x544.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id ED5002194D3B3 for ; Fri, 4 Jan 2019 03:03:30 -0800 (PST) Received: by mail-ed1-x544.google.com with SMTP id y56so31395216edd.11 for ; Fri, 04 Jan 2019 03:03:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rkBXbnnSwEAuSIZQjA2ejlMMJA2NWNE2JeKzEXtMOrM=; b=T0Z6wl5D2aIodbv6SiysqZTOl7HuMyIu5vSCJY7WTdAfd7v/qYGzJICIOQWHDcdCTn eBB1tNMPHf17kxAwL8wOZeo2+ocr22kR5ltA438GNk0I5uBicZG0lsskOGVbr3PnpYX8 gURo0eIbQxBumcZidOC5Aa2aG34s0vZwg9V7Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rkBXbnnSwEAuSIZQjA2ejlMMJA2NWNE2JeKzEXtMOrM=; b=EiKf8RPiD5efaqsTFCcpGhBN9wO4JDkkmUvcVP5jGoX0mo1wqtPFZiJBU619mpXaEx mzDTSHU/fCEcKNU4a0k6AC8UCDbi6eSnoEhm8pLkSgbAdqmonBkCBq1bmt6oD9+wsxHE R1KeKFlQBMem6vZaoGcWbtmrm+ya0NghDJ7zzKqhkh+1I46bBm6fhSvddLza9S2bgy9h QoVgWAcrLvPRSXuSF8eNIWz75M6RZAWPTBfgScz1hWeLFUXXv8zs3GMctuYFbTWU+s8a tUoUOO6A0vhFZeM8A527fTVZaMErXAKKl0QCcSLkoYI9LZwe84OtCbWLh9UE5PM49XRC puQQ== X-Gm-Message-State: AA+aEWYO+7f2IcRtYr7SFpnOgbUremcIs3hDIraPANYFd6Ukm2GesRUt YNry44dgdXU0TbDohR3BiiOCCc6iEYTlPg== X-Received: by 2002:a17:906:4e82:: with SMTP id v2-v6mr38055082eju.149.1546599809350; Fri, 04 Jan 2019 03:03:29 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:704e:c241:dc88:597d]) by smtp.gmail.com with ESMTPSA id n11sm26650578edn.14.2019.01.04.03.03.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Jan 2019 03:03:28 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Fri, 4 Jan 2019 12:03:11 +0100 Message-Id: <20190104110315.18339-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190104110315.18339-1-ard.biesheuvel@linaro.org> References: <20190104110315.18339-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 4/8] StandaloneMmPkg/StandaloneMmCoreEntryPoint: remove bogus ASSERT_EFI_ERROR()s X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" ASSERT_EFI_ERROR (x) is a shorthand for ASSERT(!EFI_ERROR(x)), and so it should only be used with EFI_STATUS type expressions. So drop two instances that operate on other types, since neither looks particularly useful. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c | 2 -- 1 file changed, 2 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Supreeth Venkatesh diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c index 05ed6c8dd0b5..5cca532456fd 100644 --- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c +++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/AArch64/StandaloneMmCoreEntryPoint.c @@ -295,7 +295,6 @@ _ModuleEntryPoint ( // ProcessModuleEntryPointList (HobStart); - ASSERT_EFI_ERROR (CpuDriverEntryPoint); DEBUG ((DEBUG_INFO, "Shared Cpu Driver EP 0x%lx\n", (UINT64) CpuDriverEntryPoint)); finish: @@ -303,5 +302,4 @@ finish: InitMmFoundationSvcArgs.Arg0 = ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64; InitMmFoundationSvcArgs.Arg1 = Status; DelegatedEventLoop (&InitMmFoundationSvcArgs); - ASSERT_EFI_ERROR (0); }