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

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

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

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

disk/part.c | 2 +-
drivers/block/systemace.c | 14 +++-----------
include/part.h | 2 --
include/systemace.h | 7 -------
4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/disk/part.c b/disk/part.c
index 30ae030..d52d48b 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -41,7 +41,7 @@ const struct block_drvr block_drvr[] = {
},
#endif
#if defined(CONFIG_SYSTEMACE)
- { .name = "ace", .get_dev = systemace_get_dev, },
+ { .name = "ace", },
#endif
#if defined(CONFIG_SANDBOX)
{ .name = "host", .get_dev = host_get_dev, },
diff --git a/drivers/block/systemace.c b/drivers/block/systemace.c
index 0d8e26f..4f14d5f 100644
--- a/drivers/block/systemace.c
+++ b/drivers/block/systemace.c
@@ -104,8 +104,7 @@ static void release_cf_lock(void)
ace_writew((val & 0xffff), 0x18);
}

-#ifdef CONFIG_PARTITIONS
-struct blk_desc *systemace_get_dev(int dev)
+static int systemace_get_dev(int dev, struct blk_desc **descp)
{
/* The first time through this, the systemace_dev object is
not yet initialized. In that case, fill it in. */
@@ -127,14 +126,7 @@ struct blk_desc *systemace_get_dev(int dev)
part_init(&systemace_dev);

}
-
- return &systemace_dev;
-}
-#endif
-
-static int systemace_get_devp(int dev, struct blk_desc **descp)
-{
- *descp = systemace_get_dev(dev);
+ *descp = &systemace_dev;

return 0;
}
@@ -269,5 +261,5 @@ U_BOOT_LEGACY_BLK(systemace) = {
.if_typename = "ace",
.if_type = IF_TYPE_SYSTEMACE,
.max_devs = 1,
- .get_dev = systemace_get_devp,
+ .get_dev = systemace_get_dev,
};
diff --git a/include/part.h b/include/part.h
index 03d4b3d..29625f6 100644
--- a/include/part.h
+++ b/include/part.h
@@ -91,7 +91,6 @@ struct blk_desc *blk_get_dev(const char *ifname, int dev);
* @return 0 if OK, other value for an error
*/
int mmc_select_hwpart(int dev_num, int hwpart);
-struct blk_desc *systemace_get_dev(int dev);
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);
@@ -171,7 +170,6 @@ extern const struct block_drvr block_drvr[];
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 *systemace_get_dev(int dev) { return NULL; }
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; }

diff --git a/include/systemace.h b/include/systemace.h
index 3b6ec7d..bccb2a2 100644
--- a/include/systemace.h
+++ b/include/systemace.h
@@ -7,11 +7,4 @@
* SPDX-License-Identifier: GPL-2.0+
*/

-#ifdef CONFIG_SYSTEMACE
-
-# include <part.h>
-
-struct blk_desc *systemace_get_dev(int dev);
-
-#endif /* CONFIG_SYSTEMACE */
#endif /* __SYSTEMACE_H */
--
2.8.0.rc3.226.g39d4020