On 12/3/23 08:39, Marek Vasut wrote: > Place the SDR104/HS200/HS400 checks into the mmc_deinit() and always > call it. This simplifies the code and removes ifdeffery. No functional > change is expected. > > Signed-off-by: Marek Vasut <marek.vasut+rene...@mailbox.org>
Reviewed-by: Jaehoon Chung <jh80.ch...@samsung.com> Best Regards, Jaehoon Chung > --- > Cc: Jaehoon Chung <jh80.ch...@samsung.com> > Cc: Peng Fan <peng....@nxp.com> > --- > drivers/mmc/mmc-uclass.c | 13 +------------ > drivers/mmc/mmc.c | 9 +++++---- > 2 files changed, 6 insertions(+), 16 deletions(-) > > diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c > index 328456831dd..cdead044177 100644 > --- a/drivers/mmc/mmc-uclass.c > +++ b/drivers/mmc/mmc-uclass.c > @@ -494,10 +494,7 @@ static int mmc_blk_probe(struct udevice *dev) > if (ret) { > debug("Probing %s failed (err=%d)\n", dev->name, ret); > > - if (CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || > - CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || > - CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)) > - mmc_deinit(mmc); > + mmc_deinit(mmc); > > return ret; > } > @@ -505,9 +502,6 @@ static int mmc_blk_probe(struct udevice *dev) > return 0; > } > > -#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || \ > - CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ > - CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) > static int mmc_blk_remove(struct udevice *dev) > { > struct udevice *mmc_dev = dev_get_parent(dev); > @@ -516,7 +510,6 @@ static int mmc_blk_remove(struct udevice *dev) > > return mmc_deinit(mmc); > } > -#endif > > static const struct blk_ops mmc_blk_ops = { > .read = mmc_bread, > @@ -532,12 +525,8 @@ U_BOOT_DRIVER(mmc_blk) = { > .id = UCLASS_BLK, > .ops = &mmc_blk_ops, > .probe = mmc_blk_probe, > -#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || \ > - CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ > - CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) > .remove = mmc_blk_remove, > .flags = DM_FLAG_OS_PREPARE, > -#endif > }; > #endif /* CONFIG_BLK */ > > diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c > index d96db7a0f83..eb5010c1465 100644 > --- a/drivers/mmc/mmc.c > +++ b/drivers/mmc/mmc.c > @@ -3010,13 +3010,15 @@ int mmc_init(struct mmc *mmc) > return err; > } > > -#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || \ > - CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ > - CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) > int mmc_deinit(struct mmc *mmc) > { > u32 caps_filtered; > > + if (!CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) && > + !CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) && > + !CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)) > + return 0; > + > if (!mmc->has_init) > return 0; > > @@ -3034,7 +3036,6 @@ int mmc_deinit(struct mmc *mmc) > return mmc_select_mode_and_width(mmc, caps_filtered); > } > } > -#endif > > int mmc_set_dsr(struct mmc *mmc, u16 val) > {