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

Simon Glass
2016-04-10T02:45:18Z

This function is implemented by the legacy block functions now. Drop it.

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

common/ide.c | 7 -------
disk/part.c | 2 +-
include/part.h | 2 --
3 files changed, 1 insertion(+), 10 deletions(-)

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 7a1f75e..a3a476e 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 9be75d2..f005a7c 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; }
--
2.8.0.rc3.226.g39d4020