summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-05-01 11:36:17 -0600
committerSimon Glass <sjg@chromium.org>2016-05-17 09:54:43 -0600
commit4e7189d4d8c2ab46c4c580ae300c14d1a9c20b11 (patch)
treef7e296c0b27dd04d2eebced48139b4ccabf6c565
parentedd82ab3547e27b4c1ab1ee7e620f982db9126ad (diff)
downloadtalos-obmc-uboot-4e7189d4d8c2ab46c4c580ae300c14d1a9c20b11.tar.gz
talos-obmc-uboot-4e7189d4d8c2ab46c4c580ae300c14d1a9c20b11.zip
dm: sata: Drop the get_dev() function
This function is implemented by the legacy block functions now. Drop it. We cannot yet make sata_dev_desc[] private to common/sata.c as it is used by the SATA drivers. This will require the SATA interface to be reworked. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--disk/part.c2
-rw-r--r--include/part.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/disk/part.c b/disk/part.c
index 67cb6c0c0b..4fc774bb97 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -26,7 +26,7 @@ const struct block_drvr block_drvr[] = {
{ .name = "ide", },
#endif
#if defined(CONFIG_CMD_SATA)
- {.name = "sata", .get_dev = sata_get_dev, },
+ {.name = "sata", },
#endif
#if defined(CONFIG_SCSI)
{ .name = "scsi", },
diff --git a/include/part.h b/include/part.h
index ecb049f9a8..74bb5d6f96 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 *sata_get_dev(int dev);
/**
* mmc_select_hwpart() - Select the MMC hardware partiion on an MMC device
@@ -171,7 +170,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 *sata_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; }
OpenPOWER on IntegriCloud