dm: scsi: 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
3c457f4d2e
commit
edd82ab354
|
@ -327,13 +327,6 @@ void scsi_init(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PARTITIONS
|
||||
struct blk_desc *scsi_get_dev(int dev)
|
||||
{
|
||||
return (dev < CONFIG_SYS_SCSI_MAX_DEVICE) ? &scsi_dev_desc[dev] : NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* copy src to dest, skipping leading and trailing blanks
|
||||
* and null terminate the string
|
||||
*/
|
||||
|
|
|
@ -34,7 +34,7 @@ int spl_sata_load_image(void)
|
|||
} else {
|
||||
/* try to recognize storage devices immediately */
|
||||
scsi_scan(0);
|
||||
stor_dev = scsi_get_dev(0);
|
||||
stor_dev = blk_get_devnum_by_type(IF_TYPE_SCSI, 0);
|
||||
if (!stor_dev)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ const struct block_drvr block_drvr[] = {
|
|||
{.name = "sata", .get_dev = sata_get_dev, },
|
||||
#endif
|
||||
#if defined(CONFIG_SCSI)
|
||||
{ .name = "scsi", .get_dev = scsi_get_dev, },
|
||||
{ .name = "scsi", },
|
||||
#endif
|
||||
#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
|
||||
{ .name = "usb", },
|
||||
|
|
|
@ -74,7 +74,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);
|
||||
|
||||
/**
|
||||
* mmc_select_hwpart() - Select the MMC hardware partiion on an MMC device
|
||||
|
@ -173,7 +172,6 @@ extern const struct block_drvr block_drvr[];
|
|||
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 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; }
|
||||
|
|
Loading…
Reference in a new issue