diff mbox

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

Message ID 1462124192-8748-27-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/ide.c   | 7 -------
 disk/part.c    | 2 +-
 include/part.h | 2 --
 3 files changed, 1 insertion(+), 10 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/ide.c   | 7 -------
>  disk/part.c    | 2 +-
>  include/part.h | 2 --
>  3 files changed, 1 insertion(+), 10 deletions(-)

Applied to u-boot-dm.
diff mbox

Patch

diff --git a/common/ide.c b/common/ide.c
index adc1966..5dc90d4 100644
--- a/common/ide.c
+++ b/common/ide.c
@@ -890,13 +890,6 @@  void ide_init(void)
 	WATCHDOG_RESET();
 }
 
-#ifdef CONFIG_PARTITIONS
-struct blk_desc *ide_get_dev(int dev)
-{
-	return (dev < CONFIG_SYS_IDE_MAXDEVICE) ? &ide_dev_desc[dev] : NULL;
-}
-#endif
-
 /* We only need to swap data if we are running on a big endian cpu. */
 #if defined(__LITTLE_ENDIAN)
 __weak void ide_input_swap_data(int dev, ulong *sect_buf, int words)
diff --git a/disk/part.c b/disk/part.c
index 1b33928..bf224b2 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -23,7 +23,7 @@ 
 
 const struct block_drvr block_drvr[] = {
 #if defined(CONFIG_CMD_IDE)
-	{ .name = "ide", .get_dev = ide_get_dev, },
+	{ .name = "ide", },
 #endif
 #if defined(CONFIG_CMD_SATA)
 	{.name = "sata", .get_dev = sata_get_dev, },
diff --git a/include/part.h b/include/part.h
index f206910..f09b794 100644
--- a/include/part.h
+++ b/include/part.h
@@ -73,7 +73,6 @@  typedef struct disk_partition {
  *	   error occurred.
  */
 struct blk_desc *blk_get_dev(const char *ifname, int dev);
-struct blk_desc *ide_get_dev(int dev);
 struct blk_desc *sata_get_dev(int dev);
 struct blk_desc *scsi_get_dev(int dev);
 struct blk_desc *mmc_get_dev(int dev);
@@ -174,7 +173,6 @@  extern const struct block_drvr block_drvr[];
 #else
 static inline struct blk_desc *blk_get_dev(const char *ifname, int dev)
 { return NULL; }
-static inline struct blk_desc *ide_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 *mmc_get_dev(int dev) { return NULL; }