summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-05-01 11:36:18 -0600
committerSimon Glass <sjg@chromium.org>2016-05-17 09:54:43 -0600
commitf6d000edbeaddfe8e5b5e3be9fd3f6c76fdff6d2 (patch)
tree1bcd5e9711b5552cf9ae398c7497d2fbf88a0932 /drivers
parent4e7189d4d8c2ab46c4c580ae300c14d1a9c20b11 (diff)
downloadu-boot-f6d000edbeaddfe8e5b5e3be9fd3f6c76fdff6d2.tar.gz
u-boot-f6d000edbeaddfe8e5b5e3be9fd3f6c76fdff6d2.tar.bz2
u-boot-f6d000edbeaddfe8e5b5e3be9fd3f6c76fdff6d2.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/systemace.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/block/systemace.c b/drivers/block/systemace.c
index 0d8e26f8aa..4f14d5feee 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,
};