mmc: core: refactor debugfs code

Now, CONFIG_DEBUG_FS is scattered in various functions, to make code
clean centralized processing CONFIG_DEBUG_FS in mmc debugfs module.

Signed-off-by: Ye Bin <yebin10@huawei.com>
Link: https://lore.kernel.org/r/20221126102520.2824574-1-yebin@huaweicloud.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index d8762fa..36679f4 100644 (file)
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -359,9 +359,7 @@ int mmc_add_card(struct mmc_card *card)
                        uhs_bus_speed_mode, type, card->rca);
        }
 
-#ifdef CONFIG_DEBUG_FS
        mmc_add_card_debugfs(card);
-#endif
        card->dev.of_node = mmc_of_find_child_device(card->host, 0);
 
        device_enable_async_suspend(&card->dev);
@@ -383,9 +381,7 @@ void mmc_remove_card(struct mmc_card *card)
 {
        struct mmc_host *host = card->host;
 
-#ifdef CONFIG_DEBUG_FS
        mmc_remove_card_debugfs(card);
-#endif
 
        if (mmc_card_present(card)) {
                if (mmc_host_is_spi(card->host)) {

diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index f5f3f62..37091a6 100644 (file)
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -86,11 +86,26 @@ int mmc_attach_sdio(struct mmc_host *host);
 extern bool use_spi_crc;
 
 /* Debugfs information for hosts and cards */
+#ifdef CONFIG_DEBUG_FS
 void mmc_add_host_debugfs(struct mmc_host *host);
 void mmc_remove_host_debugfs(struct mmc_host *host);
 
 void mmc_add_card_debugfs(struct mmc_card *card);
 void mmc_remove_card_debugfs(struct mmc_card *card);
+#else
+static inline void mmc_add_host_debugfs(struct mmc_host *host)
+{
+}
+static inline void mmc_remove_host_debugfs(struct mmc_host *host)
+{
+}
+static inline void mmc_add_card_debugfs(struct mmc_card *card)
+{
+}
+static inline void mmc_remove_card_debugfs(struct mmc_card *card)
+{
+}
+#endif
 
 int mmc_execute_tuning(struct mmc_card *card);
 int mmc_hs200_to_hs400(struct mmc_card *card);

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 5457c8a..d17eda7 100644 (file)
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -629,9 +629,7 @@ int mmc_add_host(struct mmc_host *host)
 
        led_trigger_register_simple(dev_name(&host->class_dev), &host->led);
 
-#ifdef CONFIG_DEBUG_FS
        mmc_add_host_debugfs(host);
-#endif
 
        mmc_start_host(host);
        return 0;
@@ -651,9 +649,7 @@ void mmc_remove_host(struct mmc_host *host)
 {
        mmc_stop_host(host);
 
-#ifdef CONFIG_DEBUG_FS
        mmc_remove_host_debugfs(host);
-#endif
 
        device_del(&host->class_dev);