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>
This commit is contained in:
parent
74001a2570
commit
3c457f4d2e
|
@ -432,7 +432,7 @@ static int do_mmc_part(cmd_tbl_t *cmdtp, int flag,
|
||||||
if (!mmc)
|
if (!mmc)
|
||||||
return CMD_RET_FAILURE;
|
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) {
|
if (mmc_dev != NULL && mmc_dev->type != DEV_TYPE_UNKNOWN) {
|
||||||
part_print(mmc_dev);
|
part_print(mmc_dev);
|
||||||
return CMD_RET_SUCCESS;
|
return CMD_RET_SUCCESS;
|
||||||
|
|
|
@ -37,7 +37,6 @@ const struct block_drvr block_drvr[] = {
|
||||||
#if defined(CONFIG_MMC)
|
#if defined(CONFIG_MMC)
|
||||||
{
|
{
|
||||||
.name = "mmc",
|
.name = "mmc",
|
||||||
.get_dev = mmc_get_dev,
|
|
||||||
.select_hwpart = mmc_select_hwpart,
|
.select_hwpart = mmc_select_hwpart,
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1582,7 +1582,7 @@ void mmc_destroy(struct mmc *mmc)
|
||||||
free(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);
|
struct mmc *mmc = find_mmc_device(dev);
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -1598,18 +1598,6 @@ static int mmc_get_devp(int dev, struct blk_desc **descp)
|
||||||
return 0;
|
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. */
|
/* board-specific MMC power initializations. */
|
||||||
__weak void board_mmc_power_init(void)
|
__weak void board_mmc_power_init(void)
|
||||||
{
|
{
|
||||||
|
@ -1987,5 +1975,5 @@ U_BOOT_LEGACY_BLK(mmc) = {
|
||||||
.if_typename = "mmc",
|
.if_typename = "mmc",
|
||||||
.if_type = IF_TYPE_MMC,
|
.if_type = IF_TYPE_MMC,
|
||||||
.max_devs = -1,
|
.max_devs = -1,
|
||||||
.get_dev = mmc_get_devp,
|
.get_dev = mmc_get_dev,
|
||||||
};
|
};
|
||||||
|
|
|
@ -75,7 +75,6 @@ typedef struct disk_partition {
|
||||||
struct blk_desc *blk_get_dev(const char *ifname, int dev);
|
struct blk_desc *blk_get_dev(const char *ifname, int dev);
|
||||||
struct blk_desc *sata_get_dev(int dev);
|
struct blk_desc *sata_get_dev(int dev);
|
||||||
struct blk_desc *scsi_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
|
* 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; }
|
{ return NULL; }
|
||||||
static inline struct blk_desc *sata_get_dev(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 *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 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 *systemace_get_dev(int dev) { return NULL; }
|
||||||
static inline struct blk_desc *mg_disk_get_dev(int dev) { return NULL; }
|
static inline struct blk_desc *mg_disk_get_dev(int dev) { return NULL; }
|
||||||
|
|
Loading…
Reference in New Issue