dm: mmc: Drop the get_dev() function

This function is implemented by the legacy block functions now. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/mmc.c b/cmd/mmc.c
index c5454bf2e130fac5b5d577fbfb2ee97ed3aaa268..4f251870ee53dae72f4646f6e832ab3525fdd0a6 100644 (file)
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -432,7 +432,7 @@ static int do_mmc_part(cmd_tbl_t *cmdtp, int flag,
        if (!mmc)
                return CMD_RET_FAILURE;
 
-       mmc_dev = mmc_get_dev(curr_device);
+       mmc_dev = blk_get_devnum_by_type(IF_TYPE_MMC, curr_device);
        if (mmc_dev != NULL && mmc_dev->type != DEV_TYPE_UNKNOWN) {
                part_print(mmc_dev);
                return CMD_RET_SUCCESS;

diff --git a/disk/part.c b/disk/part.c
index bf224b2c5280ac274a921661168707a932595165..e70bef5aabed0de6349d031e4a7f80cea7290d0f 100644 (file)
--- a/disk/part.c
+++ b/disk/part.c
@@ -37,7 +37,6 @@ const struct block_drvr block_drvr[] = {
 #if defined(CONFIG_MMC)
        {
                .name = "mmc",
-               .get_dev = mmc_get_dev,
                .select_hwpart = mmc_select_hwpart,
        },
 #endif

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 024368c72747333aeee256cd2c736222c7322d98..185d7b2a8e3a6a58a97b9d5c8628ef2db40a9c10 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1582,7 +1582,7 @@ void mmc_destroy(struct mmc *mmc)
        free(mmc);
 }
 
-static int mmc_get_devp(int dev, struct blk_desc **descp)
+static int mmc_get_dev(int dev, struct blk_desc **descp)
 {
        struct mmc *mmc = find_mmc_device(dev);
        int ret;
@@ -1598,18 +1598,6 @@ static int mmc_get_devp(int dev, struct blk_desc **descp)
        return 0;
 }
 
-#ifdef CONFIG_PARTITIONS
-struct blk_desc *mmc_get_dev(int dev)
-{
-       struct blk_desc *desc;
-
-       if (mmc_get_devp(dev, &desc))
-               return NULL;
-
-       return desc;
-}
-#endif
-
 /* board-specific MMC power initializations. */
 __weak void board_mmc_power_init(void)
 {
@@ -1987,5 +1975,5 @@ U_BOOT_LEGACY_BLK(mmc) = {
        .if_typename    = "mmc",
        .if_type        = IF_TYPE_MMC,
        .max_devs       = -1,
-       .get_dev        = mmc_get_devp,
+       .get_dev        = mmc_get_dev,
 };

diff --git a/include/part.h b/include/part.h
index f09b794d61e2929a27368e5c44d124f586378c31..1535930b90df37a9d7ea07b0ebd911b6e4c25c41 100644 (file)
--- a/include/part.h
+++ b/include/part.h
@@ -75,7 +75,6 @@ typedef struct disk_partition {
 struct blk_desc *blk_get_dev(const char *ifname, int dev);
 struct blk_desc *sata_get_dev(int dev);
 struct blk_desc *scsi_get_dev(int dev);
-struct blk_desc *mmc_get_dev(int dev);
 
 /**
  * mmc_select_hwpart() - Select the MMC hardware partiion on an MMC device
@@ -175,7 +174,6 @@ static inline struct blk_desc *blk_get_dev(const char *ifname, int dev)
 { return NULL; }
 static inline struct blk_desc *sata_get_dev(int dev) { return NULL; }
 static inline struct blk_desc *scsi_get_dev(int dev) { return NULL; }
-static inline struct blk_desc *mmc_get_dev(int dev) { return NULL; }
 static inline int mmc_select_hwpart(int dev_num, int hwpart) { return -1; }
 static inline struct blk_desc *systemace_get_dev(int dev) { return NULL; }
 static inline struct blk_desc *mg_disk_get_dev(int dev) { return NULL; }