Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6-omap-h63xx.git] / drivers / mmc / core / bus.c

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index fd95b18e988b3c33496c309f41dcc38356a82c47..f210a8ee6861498f10ec1ecafbcd8a09b0b9f9fa 100644 (file)
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -216,8 +216,7 @@ int mmc_add_card(struct mmc_card *card)
        int ret;
        const char *type;
 
-       snprintf(card->dev.bus_id, sizeof(card->dev.bus_id),
-                "%s:%04x", mmc_hostname(card->host), card->rca);
+       dev_set_name(&card->dev, "%s:%04x", mmc_hostname(card->host), card->rca);
 
        switch (card->type) {
        case MMC_TYPE_MMC:
@@ -252,6 +251,10 @@ int mmc_add_card(struct mmc_card *card)
        if (ret)
                return ret;
 
+#ifdef CONFIG_DEBUG_FS
+       mmc_add_card_debugfs(card);
+#endif
+
        mmc_card_set_present(card);
 
        return 0;
@@ -263,6 +266,10 @@ int mmc_add_card(struct mmc_card *card)
  */
 void mmc_remove_card(struct mmc_card *card)
 {
+#ifdef CONFIG_DEBUG_FS
+       mmc_remove_card_debugfs(card);
+#endif
+
        if (mmc_card_present(card)) {
                if (mmc_host_is_spi(card->host)) {
                        printk(KERN_INFO "%s: SPI card removed\n",