From patchwork Sun Feb 5 22:40:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1737859 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=85.214.62.61; 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=XerDUWf5; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P94bd22xkz23r4 for ; Mon, 6 Feb 2023 09:59:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2E89585AA0; Sun, 5 Feb 2023 23:52:12 +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="XerDUWf5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3E758859F9; Sun, 5 Feb 2023 23:51:53 +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-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 8EF0B85ACF for ; Sun, 5 Feb 2023 23:43:15 +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-x134.google.com with SMTP id w13so4117002ilv.3 for ; Sun, 05 Feb 2023 14:43:14 -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=QLRUBs6ZwxCD1EXsa5YAcBVxI4lAoUBhd0Lj37SZNFo=; b=XerDUWf5JZ3+Kt5o23yYRnP+kltKfbJv6GpgP7BwoqqXovWQ+z6OUa1L5+tLG499/s n/KcvuFV0gtqwb//MqLjrA6QunZHWQApk1Ge9YP9LQsAVKjd4UqUrQeOHjZROIZv1EZN dxfwqMAAuhFoOHkBJrgopITI0TseFBm23XEMc= 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=QLRUBs6ZwxCD1EXsa5YAcBVxI4lAoUBhd0Lj37SZNFo=; b=FDG3d400WECU9yqCStV9gSVyG8kP3WbyiQj1T0qgn0lObG4MEE+N93ecGW9IhF0wLK aVjFocGvRjpHKRKV8ePl49a37C0go6j5pIu91RenO4g0tpvg0FJTanNMRK/dPtuypohB 0FI9zRDGhszlIWBFuxeg6oj4E1N84qj5Kz3rRwijus0JzMDSUD0UrN2CJMZ/6zzk10hL v8XoIgzYthYkUH/sHgdSK2DkEaORIXSAAReYPSBGjvGB5BvM1xJtsYu7MNbsywcOUj5q kfXEMDODcP+eOY/eoXgXwZBWZrBQglBSb6FKNvROxvsOGarq5Z5zHpX/2CtdfC/id5o0 rqog== X-Gm-Message-State: AO0yUKXCmqW+g4cHRTQVbKys/atmOrTbLKOGQU0iBjMYRmyqxuImsYwi f18OjkHJ5wYGAVWJi7FddPkuKfA4VlpQDDY4 X-Google-Smtp-Source: AK7set+LHl5f0KzBtkInkfslZZZ65ko32Jp2uRsC3egsB4YQ84eeK/Eqd6G8DwqXNdwxBhqeXQOfZA== X-Received: by 2002:a05:6e02:19c7:b0:30f:c8fd:d67a with SMTP id r7-20020a056e0219c700b0030fc8fdd67amr16021580ill.29.1675636981722; Sun, 05 Feb 2023 14:43:01 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:01 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 107/169] Correct SPL use of MMC_QUIRKS Date: Sun, 5 Feb 2023 15:40:16 -0700 Message-Id: <20230205224118.233425-108-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 Reviewed-by: Jaehoon Chung --- (no changes since v1) 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);