diff mbox

[U-Boot,v2,32/44] dm: sandbox: Drop the host_get_dev() function

Message ID 1462124192-8748-33-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

 disk/part.c             |  2 +-
 drivers/block/sandbox.c | 10 ----------
 include/part.h          |  2 --
 3 files changed, 1 insertion(+), 13 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
>
>  disk/part.c             |  2 +-
>  drivers/block/sandbox.c | 10 ----------
>  include/part.h          |  2 --
>  3 files changed, 1 insertion(+), 13 deletions(-)

Applied to u-boot-dm.
diff mbox

Patch

diff --git a/disk/part.c b/disk/part.c
index 28c8706..e635d90 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -44,7 +44,7 @@  const struct block_drvr block_drvr[] = {
 	{ .name = "ace", },
 #endif
 #if defined(CONFIG_SANDBOX)
-	{ .name = "host", .get_dev = host_get_dev, },
+	{ .name = "host", },
 #endif
 	{ },
 };
diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
index 2b6a893..ac28f83 100644
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -217,16 +217,6 @@  int host_get_dev_err(int devnum, struct blk_desc **blk_devp)
 	return 0;
 }
 
-struct blk_desc *host_get_dev(int dev)
-{
-	struct blk_desc *blk_dev;
-
-	if (host_get_dev_err(dev, &blk_dev))
-		return NULL;
-
-	return blk_dev;
-}
-
 #ifdef CONFIG_BLK
 static const struct blk_ops sandbox_host_blk_ops = {
 	.read	= host_block_read,
diff --git a/include/part.h b/include/part.h
index 3b59139..47f5baf 100644
--- a/include/part.h
+++ b/include/part.h
@@ -92,7 +92,6 @@  struct blk_desc *blk_get_dev(const char *ifname, int dev);
  */
 int mmc_select_hwpart(int dev_num, int hwpart);
 struct blk_desc *mg_disk_get_dev(int dev);
-struct blk_desc *host_get_dev(int dev);
 int host_get_dev_err(int dev, struct blk_desc **blk_devp);
 
 /* disk/part.c */
@@ -171,7 +170,6 @@  static inline struct blk_desc *blk_get_dev(const char *ifname, int dev)
 { return NULL; }
 static inline int mmc_select_hwpart(int dev_num, int hwpart) { return -1; }
 static inline struct blk_desc *mg_disk_get_dev(int dev) { return NULL; }
-static inline struct blk_desc *host_get_dev(int dev) { return NULL; }
 
 static inline int part_get_info(struct blk_desc *dev_desc, int part,
 				disk_partition_t *info) { return -1; }