mmc: core: Remove the redundant mmc_send_ext_csd() API

[cascardo/linux.git] / drivers / mmc / core / mmc_ops.c

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 7911e05..9a6181b 100644 (file)
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -378,12 +378,35 @@ err:
        return ret;
 }
 
-int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd)
+int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd)
 {
-       return mmc_send_cxd_data(card, card->host, MMC_SEND_EXT_CSD,
-                       ext_csd, 512);
+       int err;
+       u8 *ext_csd;
+
+       if (!card || !new_ext_csd)
+               return -EINVAL;
+
+       if (!mmc_can_ext_csd(card))
+               return -EOPNOTSUPP;
+
+       /*
+        * As the ext_csd is so large and mostly unused, we don't store the
+        * raw block in mmc_card.
+        */
+       ext_csd = kmalloc(512, GFP_KERNEL);
+       if (!ext_csd)
+               return -ENOMEM;
+
+       err = mmc_send_cxd_data(card, card->host, MMC_SEND_EXT_CSD, ext_csd,
+                               512);
+       if (err)
+               kfree(ext_csd);
+       else
+               *new_ext_csd = ext_csd;
+
+       return err;
 }
-EXPORT_SYMBOL_GPL(mmc_send_ext_csd);
+EXPORT_SYMBOL_GPL(mmc_get_ext_csd);
 
 int mmc_spi_read_ocr(struct mmc_host *host, int highcap, u32 *ocrp)
 {
@@ -675,3 +698,8 @@ int mmc_send_hpi_cmd(struct mmc_card *card, u32 *status)
 
        return 0;
 }
+
+int mmc_can_ext_csd(struct mmc_card *card)
+{
+       return (card && card->csd.mmca_vsn > CSD_SPEC_VER_3);
+}