dm: systemace: 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>

diff --git a/disk/part.c b/disk/part.c
index 4fc774bb9725a58e7008cad6460fe57ccfc823e0..28c870664d63435f8adcfd3392895f015177aab8 100644 (file)
--- 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 0d8e26f8aab8abb7e4a665d7431d905f9b5ca883..4f14d5feeeacdc69428ac1229d9f402444fb5357 100644 (file)
--- 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 74bb5d6f9678047d3bf914fdfb4c444cca3264b1..3b59139f1476e6b25073bc4b04ccb14e0df4aa10 100644 (file)
--- 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 3b6ec7da4b41e981022ecd2d731f44bb3504fd74..bccb2a2ddf5c7f2a3ae554b9add261d4f33975b1 100644 (file)
--- 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 */