From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3D496C05027 for ; Thu, 9 Feb 2023 12:30:31 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EC2DC85D58; Thu, 9 Feb 2023 13:30:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1675945829; bh=uYilizHpeoaS1mz6phaz2OHEAfg6qCArOJ8m840mPS8=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=huS+fxa9pzeZZ+ffc3GOWJpzdwkWFJcYcnUnXoU8XAl3yeq94VwH2/WqqF0WSw87i lyUQs6sJSBcHbJI9MEt9Z1uRXwuFcZDKpDhUKv071RHU+hwpxcJnMPx+z1a6pUzdUV JWpaNLaGtIaIV3pOzwa1l8XBPr5E51OtQ1mgY/JFYt4vbJMB4fllK8OYz7C71XLTyP 0kCyjVweh2W5gexc6U2T55vi8QOGDtzGI7lskxhZGRfOaw7NA3BWaVko6r+uY9hdCp bcVM59RsXsp1PidecAFnfh6/tbepn5osXk7zeRoNSIubm5M1eZwXZFmuSqdXeJz/Ox IFD4jIGslqsWg== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 3AAAF85D0C; Thu, 9 Feb 2023 13:30:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1675945822; bh=uYilizHpeoaS1mz6phaz2OHEAfg6qCArOJ8m840mPS8=; h=From:To:Cc:Subject:Date:From; b=HuMZw+a7Z4eL4Cem7Pgka6rEEJUnp/uECuEJwpnAZOEQDuNnVyfx1pOpT/HDLLa5D 9yUDjq+b4eWqvTQXRef4czJHEkZoIdVFZkuNIR1kc8xSxoAXfaDVl9JlpaUAvKFQPg vf4MVXZ5LwbHNy6qXsvY6f/d/y6FOyEDEylOK+JuZ6+Zep+2ehClB2SQqwxWW0B55Z dDnh9NKKgFsNIWxU7ocbyPQYj3RkvaZHD8QopsKeu9BkIkEFADd/zLZvp5bcBEd/rz K16GgT5vvADWetoKhI6E3ydbIqfTm//sBJhPzKQ7PNNGOPzIF/uz7/bOXIZK7zHX9D 4kpOtWQl/E8+A== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Patrice Chotard , Patrick Delaunay , Tom Rini Subject: [PATCH v2 1/2] env: mmc: Clean up macro usage Date: Thu, 9 Feb 2023 13:30:09 +0100 Message-Id: <20230209123010.31953-1-marex@denx.de> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Consistently use 'if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID))' instead of mix of ifdef. Signed-off-by: Marek Vasut --- Cc: Patrice Chotard Cc: Patrick Delaunay Cc: Tom Rini --- V2: Replace CONFIG_IS_ENABLED(PARTITION_TYPE_GUID) with IS_ENABLED(CONFIG_PARTITION_TYPE_GUID) --- env/mmc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/env/mmc.c b/env/mmc.c index 5b01f657a7a..d51a5579128 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -73,8 +73,7 @@ static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val) if (str && !strncmp((const char *)info.name, str, sizeof(info.name))) break; -#ifdef CONFIG_PARTITION_TYPE_GUID - if (!str) { + if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID) && !str) { const efi_guid_t env_guid = PARTITION_U_BOOT_ENVIRONMENT; efi_guid_t type_guid; @@ -82,7 +81,6 @@ static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val) if (!memcmp(&env_guid, &type_guid, sizeof(efi_guid_t))) break; } -#endif } /* round up to info.blksz */ -- 2.39.1