dm: part: Rename some partition functions

[people/ms/u-boot.git] / drivers / block / sandbox.c

diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
index 73f4c4a9e98c52141118791dbf786c8dbfff70c0..093e133992dc6a4b232cd16ec35a7f08cedc3975 100644 (file)
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -22,9 +22,11 @@ static struct host_block_dev *find_host_device(int dev)
        return NULL;
 }
 
-static unsigned long host_block_read(int dev, unsigned long start,
-                                    lbaint_t blkcnt, void *buffer)
+static unsigned long host_block_read(struct blk_desc *block_dev,
+                                    unsigned long start, lbaint_t blkcnt,
+                                    void *buffer)
 {
+       int dev = block_dev->dev;
        struct host_block_dev *host_dev = find_host_device(dev);
 
        if (!host_dev)
@@ -42,9 +44,11 @@ static unsigned long host_block_read(int dev, unsigned long start,
        return -1;
 }
 
-static unsigned long host_block_write(int dev, unsigned long start,
-                                     lbaint_t blkcnt, const void *buffer)
+static unsigned long host_block_write(struct blk_desc *block_dev,
+                                     unsigned long start, lbaint_t blkcnt,
+                                     const void *buffer)
 {
+       int dev = block_dev->dev;
        struct host_block_dev *host_dev = find_host_device(dev);
        if (os_lseek(host_dev->fd,
                     start * host_dev->blk_dev.blksz,
@@ -85,7 +89,7 @@ int host_dev_bind(int dev, char *filename)
                return 1;
        }
 
-       block_dev_desc_t *blk_dev = &host_dev->blk_dev;
+       struct blk_desc *blk_dev = &host_dev->blk_dev;
        blk_dev->if_type = IF_TYPE_HOST;
        blk_dev->priv = host_dev;
        blk_dev->blksz = 512;
@@ -94,12 +98,12 @@ int host_dev_bind(int dev, char *filename)
        blk_dev->block_write = host_block_write;
        blk_dev->dev = dev;
        blk_dev->part_type = PART_TYPE_UNKNOWN;
-       init_part(blk_dev);
+       part_init(blk_dev);
 
        return 0;
 }
 
-int host_get_dev_err(int dev, block_dev_desc_t **blk_devp)
+int host_get_dev_err(int dev, struct blk_desc **blk_devp)
 {
        struct host_block_dev *host_dev = find_host_device(dev);
 
@@ -113,9 +117,9 @@ int host_get_dev_err(int dev, block_dev_desc_t **blk_devp)
        return 0;
 }
 
-block_dev_desc_t *host_get_dev(int dev)
+struct blk_desc *host_get_dev(int dev)
 {
-       block_dev_desc_t *blk_dev;
+       struct blk_desc *blk_dev;
 
        if (host_get_dev_err(dev, &blk_dev))
                return NULL;