From patchwork Mon Jan 30 15:15:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734247 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=V18CQMOE; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5C8x1xqZz1yhq for ; Tue, 31 Jan 2023 02:41:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 14BEB85ACF; Mon, 30 Jan 2023 16:28:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="V18CQMOE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 976CC85A4F; Mon, 30 Jan 2023 16:25:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3276D8596B for ; Mon, 30 Jan 2023 16:17:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x132.google.com with SMTP id l7so3349964ilf.0 for ; Mon, 30 Jan 2023 07:17:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CIcvlLhEqsTrFJ5HGqCOBIoIuOhytfnZi6BlQKydGZY=; b=V18CQMOEvLJAW+4kN9sMx062K4OljrYLHVDiDdgwW7dablQUKSGRc8+IGvCRyw+UNS 0+RnoaMbbn9xY5DUmUEp7XUss9GiDNv89/oiF1murxipkasKS9OLjumHZy3eHuvanyEs /SuPWUzxVvxc4UfGWJaEikf5l1xG29zR0X7dM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CIcvlLhEqsTrFJ5HGqCOBIoIuOhytfnZi6BlQKydGZY=; b=2n6u+4x4D7u88NChVVLqRLOjzTl7VOkE+ZH+Ok59ejHQfGyYV1MVW5/i+4CGV3lPHO S/LKJv8n/W/c+v+FjEpf9Eg2e2oYjVyHsN8d1cr3GfglMQfaRep6IEM7fn/ipAjVOAND D0c2RFooWdCCfKSdeg25THARcxG6dR/iShdMxzsMSBiV2JVaI/FUvq2cnpxLzbH67FAL kN4S6jfMLtELE2miRUiTYU5JtbpwgWfybRw0WexlVan2UuBGKg2D/GUIS48YgD9n6guh 3TH9IF5mzCGhg5eJnywwBmkBmOMjjkaZtR/ga3lZpyk3lofE1GSVKLNEwECXkVQerN/H xY+w== X-Gm-Message-State: AFqh2kpiaeUJmOBVA1sD/P26ZJ6emTCAx9YI6k5VWMxWIIcm4D+V2eim 43VUXOZE9+CGWa8FHmgT/xDU9oFdL8z/K0nn X-Google-Smtp-Source: AMrXdXv77wH0Ie94PSh1ETrXWgGHP6A57+DJc3WwVFYpAKYBaF0zz1E4Fh4CiYu6D1y6Ug3GnKCOQA== X-Received: by 2002:a92:cb82:0:b0:30c:2b07:547c with SMTP id z2-20020a92cb82000000b0030c2b07547cmr31770509ilo.26.1675091834319; Mon, 30 Jan 2023 07:17:14 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jaehoon Chung , Peng Fan Subject: [PATCH 109/171] Correct SPL use of MMC_QUIRKS Date: Mon, 30 Jan 2023 08:15:10 -0700 Message-Id: <20230130151612.212732-110-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_MMC_QUIRKS defined in Kconfig Signed-off-by: Simon Glass --- drivers/mmc/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 210703ea46b..fd4aa946e2a 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -247,7 +247,7 @@ static int mmc_send_cmd_retry(struct mmc *mmc, struct mmc_cmd *cmd, static int mmc_send_cmd_quirks(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data, u32 quirk, uint retries) { - if (CONFIG_IS_ENABLED(MMC_QUIRKS) && mmc->quirks & quirk) + if (IS_ENABLED(CONFIG_MMC_QUIRKS) && mmc->quirks & quirk) return mmc_send_cmd_retry(mmc, cmd, data, retries); else return mmc_send_cmd(mmc, cmd, data);