diff mbox

[U-Boot,v2,28/44] dm: scsi: Drop the get_dev() function

Message ID 1462124192-8748-29-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass May 1, 2016, 5:36 p.m. UTC 
This function is implemented by the legacy block functions now. Drop it.

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

Changes in v2: None

 common/scsi.c         | 7 -------
 common/spl/spl_sata.c | 2 +-
 disk/part.c           | 2 +-
 include/part.h        | 2 --
 4 files changed, 2 insertions(+), 11 deletions(-)

Comments

Simon Glass May 14, 2016, 7:36 p.m. UTC | #1 
On 1 May 2016 at 11:36, Simon Glass <sjg@chromium.org> wrote:
> This function is implemented by the legacy block functions now. Drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
>  common/scsi.c         | 7 -------
>  common/spl/spl_sata.c | 2 +-
>  disk/part.c           | 2 +-
>  include/part.h        | 2 --
>  4 files changed, 2 insertions(+), 11 deletions(-)

Applied to u-boot-dm.
diff mbox

Patch

diff --git a/common/scsi.c b/common/scsi.c
index a336a10..5b6531f 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 1719946..9d8cc7c 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;
 	}
diff --git a/disk/part.c b/disk/part.c
index e70bef5..67cb6c0 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -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", },
diff --git a/include/part.h b/include/part.h
index 1535930..ecb049f 100644
--- a/include/part.h
+++ b/include/part.h
@@ -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; }