mmc: Simplify poll CD logic in case cyclic framework is enabled

Simplify 90cc07fd786d ("mmc: Poll CD in case cyclic framework is enabled")
according to suggestions by Rasmus. The struct cyclic_info is zero-size in
case CONFIG_CYCLIC is not enabled and does not add any size to struct mmc,
so it can unconditionally be part of that structure. This allows clean up
of all the other conditionals in mmc.c which can now be unconditionally
present, as they also add no extra space.

Suggested-by: Rasmus Villemoes <ravi@prevas.dk>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 31a7236..8d26738 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -3040,9 +3040,9 @@ static int mmc_complete_init(struct mmc *mmc)
        return err;
 }
 
-static void __maybe_unused mmc_cyclic_cd_poll(struct cyclic_info *c)
+static void mmc_cyclic_cd_poll(struct cyclic_info *c)
 {
-       struct mmc *m = CONFIG_IS_ENABLED(CYCLIC, (container_of(c, struct mmc, cyclic)), (NULL));
+       struct mmc *m = container_of(c, struct mmc, cyclic);
 
        if (!m->has_init)
                return;
@@ -3078,10 +3078,8 @@ int mmc_init(struct mmc *mmc)
 
        if (CONFIG_IS_ENABLED(CYCLIC, (!mmc->cyclic.func), (NULL))) {
                /* Register cyclic function for card detect polling */
-               CONFIG_IS_ENABLED(CYCLIC, (cyclic_register(&mmc->cyclic,
-                                                          mmc_cyclic_cd_poll,
-                                                          100 * 1000,
-                                                          mmc->cfg->name)));
+               cyclic_register(&mmc->cyclic, mmc_cyclic_cd_poll, 100 * 1000,
+                               mmc->cfg->name);
        }
 
        return err;
@@ -3092,7 +3090,7 @@ int mmc_deinit(struct mmc *mmc)
        u32 caps_filtered;
 
        if (CONFIG_IS_ENABLED(CYCLIC, (mmc->cyclic.func), (NULL)))
-               CONFIG_IS_ENABLED(CYCLIC, (cyclic_unregister(&mmc->cyclic)));
+               cyclic_unregister(&mmc->cyclic);
 
        if (!CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) &&
            !CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) &&

diff --git a/include/mmc.h b/include/mmc.h
index 81bccb4..233a1d6 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -759,7 +759,11 @@ struct mmc {
 
        enum bus_mode user_speed_mode; /* input speed mode from user */
 
-       CONFIG_IS_ENABLED(CYCLIC, (struct cyclic_info cyclic));
+       /*
+        * If CONFIG_CYCLIC is not set, struct cyclic_info is
+        * zero-size structure and does not add any space here.
+        */
+       struct cyclic_info cyclic;
 };
 
 #if CONFIG_IS_ENABLED(DM_MMC)