summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-05-01 11:36:16 -0600
committerSimon Glass <sjg@chromium.org>2016-05-17 09:54:43 -0600
commitedd82ab3547e27b4c1ab1ee7e620f982db9126ad (patch)
tree11971a5c4599e85063b6bf1d46528d78491e6318 /common
parent3c457f4d2e47cc91385abe15d3c825d0ce1a2b6f (diff)
downloadtalos-obmc-uboot-edd82ab3547e27b4c1ab1ee7e620f982db9126ad.tar.gz
talos-obmc-uboot-edd82ab3547e27b4c1ab1ee7e620f982db9126ad.zip
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>
Diffstat (limited to 'common')
-rw-r--r--common/scsi.c7
-rw-r--r--common/spl/spl_sata.c2
2 files changed, 1 insertions, 8 deletions
diff --git a/common/scsi.c b/common/scsi.c
index a336a10753..5b6531f01b 100644
--- a/common/scsi.c
+++ b/common/scsi.c
@@ -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
*/
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 1719946ec5..9d8cc7c2dd 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -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;
}
OpenPOWER on IntegriCloud