summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-05-01 11:36:14 -0600
committerSimon Glass <sjg@chromium.org>2016-05-17 09:54:43 -0600
commit74001a2570ccbc120366e66dd40e8c66e3a6820c (patch)
treefccdc192fe292afe40c8f1daeca05d6e4fc479c4
parent57ebf67bad82da0b3ade1728fb39a64d1c29822f (diff)
downloadblackbird-obmc-uboot-74001a2570ccbc120366e66dd40e8c66e3a6820c.tar.gz
blackbird-obmc-uboot-74001a2570ccbc120366e66dd40e8c66e3a6820c.zip
dm: ide: 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>
-rw-r--r--common/ide.c7
-rw-r--r--disk/part.c2
-rw-r--r--include/part.h2
3 files changed, 1 insertions, 10 deletions
diff --git a/common/ide.c b/common/ide.c
index adc1966efa..5dc90d45ec 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 1b33928cc5..bf224b2c52 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 f206910970..f09b794d61 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; }
OpenPOWER on IntegriCloud