dm: Drop the block_dev_desc_t typedef

[people/ms/u-boot.git] / api / api_storage.c

diff --git a/api/api_storage.c b/api/api_storage.c
index bc2b4d6b8cc76de796d98ecb69e1f581212df6b9..225a6cf10fc1723768f83274251e1dd362efb20d 100644 (file)
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -103,7 +103,7 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
 
        int i;
 
-       block_dev_desc_t *dd;
+       struct blk_desc *dd;
 
        if (first) {
                di->cookie = (void *)get_dev(specs[type].name, 0);
@@ -148,7 +148,7 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
                di->type = specs[type].type;
 
                if (di->cookie != NULL) {
-                       dd = (block_dev_desc_t *)di->cookie;
+                       dd = (struct blk_desc *)di->cookie;
                        if (dd->type == DEV_TYPE_UNKNOWN) {
                                debugf("device instance exists, but is not active..");
                                found = 0;
@@ -166,9 +166,9 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
 
 
 /*
- * returns:    ENUM_IDE, ENUM_USB etc. based on block_dev_desc_t
+ * returns:    ENUM_IDE, ENUM_USB etc. based on struct blk_desc
  */
-static int dev_stor_type(block_dev_desc_t *dd)
+static int dev_stor_type(struct blk_desc *dd)
 {
        int i, j;
 
@@ -308,7 +308,7 @@ int dev_enum_storage(struct device_info *di)
        return 0;
 }
 
-static int dev_stor_is_valid(int type, block_dev_desc_t *dd)
+static int dev_stor_is_valid(int type, struct blk_desc *dd)
 {
        int i;
 
@@ -328,7 +328,7 @@ int dev_open_stor(void *cookie)
        if (type == ENUM_MAX)
                return API_ENODEV;
 
-       if (dev_stor_is_valid(type, (block_dev_desc_t *)cookie))
+       if (dev_stor_is_valid(type, (struct blk_desc *)cookie))
                return 0;
 
        return API_ENODEV;
@@ -348,7 +348,7 @@ int dev_close_stor(void *cookie)
 lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start)
 {
        int type;
-       block_dev_desc_t *dd = (block_dev_desc_t *)cookie;
+       struct blk_desc *dd = (struct blk_desc *)cookie;
 
        if ((type = dev_stor_type(dd)) == ENUM_MAX)
                return 0;