Skip to content

Commit 4c221ac

Browse files
schweigstillkartben
authored andcommitted
drivers: disk: sdmmc_stm32: fix compilation error for SDMMC_STM32_EMMC
Compilation fails if CONFIG_SDMMC_STM32_EMMC is set. This bugfix adds #ifdef ... #endif pairs for unused static functions and a call to stm32_sdmmc_card_detect_uninit(). Signed-off-by: Andreas Schweigstill <[email protected]>
1 parent f07f0d2 commit 4c221ac

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/disk/sdmmc_stm32.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,13 @@ static int stm32_sdmmc_dma_deinit(struct stm32_sdmmc_priv *priv)
341341
/* Forward declarations */
342342
static int stm32_sdmmc_pwr_on(struct stm32_sdmmc_priv *priv);
343343
static void stm32_sdmmc_pwr_off(struct stm32_sdmmc_priv *priv);
344+
345+
#if !defined(CONFIG_SDMMC_STM32_EMMC)
344346
static int stm32_sdmmc_card_detect_init(struct stm32_sdmmc_priv *priv);
345-
static bool stm32_sdmmc_card_present(struct stm32_sdmmc_priv *priv);
346347
static int stm32_sdmmc_card_detect_uninit(struct stm32_sdmmc_priv *priv);
348+
#endif /* !CONFIG_SDMMC_STM32_EMMC */
349+
350+
static bool stm32_sdmmc_card_present(struct stm32_sdmmc_priv *priv);
347351

348352
static int stm32_sdmmc_access_init(struct disk_info *disk)
349353
{
@@ -417,7 +421,9 @@ static int stm32_sdmmc_access_init(struct disk_info *disk)
417421
priv->status = DISK_STATUS_OK;
418422
return 0;
419423
error:
424+
#if !defined(CONFIG_SDMMC_STM32_EMMC)
420425
stm32_sdmmc_card_detect_uninit(priv);
426+
#endif /* !CONFIG_SDMMC_STM32_EMMC */
421427
stm32_sdmmc_pwr_off(priv);
422428
return err;
423429
}

0 commit comments

Comments
 (0)