1 files changed, 53 insertions, 6 deletions

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 42cc2867ed7..e4371555160 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -18,6 +18,7 @@
 
 #include "core.h"
 #include "sysfs.h"
+#include "bus.h"
 #include "mmc_ops.h"
 
 static const unsigned int tran_exp[] = {
@@ -413,8 +414,7 @@ static void mmc_detect(struct mmc_host *host)
         mmc_release_host(host);
 
         if (err != MMC_ERR_NONE) {
-                mmc_remove_card(host->card);
-                host->card = NULL;
+                mmc_remove(host);
 
                 mmc_claim_host(host);
                 mmc_detach_bus(host);
@@ -422,6 +422,53 @@ static void mmc_detect(struct mmc_host *host)
         }
 }
 
+MMC_ATTR_FN(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
+        card->raw_cid[2], card->raw_cid[3]);
+MMC_ATTR_FN(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
+        card->raw_csd[2], card->raw_csd[3]);
+MMC_ATTR_FN(date, "%02d/%04d\n", card->cid.month, card->cid.year);
+MMC_ATTR_FN(fwrev, "0x%x\n", card->cid.fwrev);
+MMC_ATTR_FN(hwrev, "0x%x\n", card->cid.hwrev);
+MMC_ATTR_FN(manfid, "0x%06x\n", card->cid.manfid);
+MMC_ATTR_FN(name, "%s\n", card->cid.prod_name);
+MMC_ATTR_FN(oemid, "0x%04x\n", card->cid.oemid);
+MMC_ATTR_FN(serial, "0x%08x\n", card->cid.serial);
+
+static struct device_attribute mmc_dev_attrs[] = {
+        MMC_ATTR_RO(cid),
+        MMC_ATTR_RO(csd),
+        MMC_ATTR_RO(date),
+        MMC_ATTR_RO(fwrev),
+        MMC_ATTR_RO(hwrev),
+        MMC_ATTR_RO(manfid),
+        MMC_ATTR_RO(name),
+        MMC_ATTR_RO(oemid),
+        MMC_ATTR_RO(serial),
+        __ATTR_NULL,
+};
+
+/*
+ * Adds sysfs entries as relevant.
+ */
+static int mmc_sysfs_add(struct mmc_host *host, struct mmc_card *card)
+{
+        int ret;
+
+        ret = mmc_add_attrs(card, mmc_dev_attrs);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+/*
+ * Removes the sysfs entries added by mmc_sysfs_add().
+ */
+static void mmc_sysfs_remove(struct mmc_host *host, struct mmc_card *card)
+{
+        mmc_remove_attrs(card, mmc_dev_attrs);
+}
+
 #ifdef CONFIG_MMC_UNSAFE_RESUME
 
 /*
@@ -455,9 +502,7 @@ static void mmc_resume(struct mmc_host *host)
 
         err = mmc_sd_init_card(host, host->ocr, host->card);
         if (err != MMC_ERR_NONE) {
-                mmc_remove_card(host->card);
-                host->card = NULL;
-
+                mmc_remove(host);
                 mmc_detach_bus(host);
         }
 
@@ -474,6 +519,8 @@ static void mmc_resume(struct mmc_host *host)
 static const struct mmc_bus_ops mmc_ops = {
         .remove = mmc_remove,
         .detect = mmc_detect,
+        .sysfs_add = mmc_sysfs_add,
+        .sysfs_remove = mmc_sysfs_remove,
         .suspend = mmc_suspend,
         .resume = mmc_resume,
 };
@@ -518,7 +565,7 @@ int mmc_attach_mmc(struct mmc_host *host, u32 ocr)
 
         mmc_release_host(host);
 
-        err = mmc_register_card(host->card);
+        err = mmc_add_card(host->card);
         if (err)
                 goto reclaim_host;