diff mbox series

[v2,107/169] Correct SPL use of MMC_QUIRKS

Message ID 20230205224118.233425-108-sjg@chromium.org
State Accepted
Commit 497b7c6beb5994acf23246f8714e0e7442e2eeb1
Delegated to: Tom Rini
Headers show
Series Kconfig: More cleanup of CONFIG options | expand

Commit Message

Simon Glass Feb. 5, 2023, 10:40 p.m. UTC
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 <sjg@chromium.org>
---

(no changes since v1)

 drivers/mmc/mmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jaehoon Chung Feb. 6, 2023, 12:30 a.m. UTC | #1
> -----Original Message-----
> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Simon Glass
> Sent: Monday, February 6, 2023 7:40 AM
> To: U-Boot Mailing List <u-boot@lists.denx.de>
> Cc: Tom Rini <trini@konsulko.com>; Simon Glass <sjg@chromium.org>
> Subject: [PATCH v2 107/169] Correct SPL use of MMC_QUIRKS
> 
> 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 <sjg@chromium.org>

Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

Best Regards,
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);
> --
> 2.39.1.519.gcb327c4b5f-goog
Tom Rini Feb. 9, 2023, 9:32 p.m. UTC | #2
On Sun, Feb 05, 2023 at 03:40:16PM -0700, Simon Glass wrote:

> 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 <sjg@chromium.org>
> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

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);