drm/ttm: device naming cleanup

[linux-2.6-microblaze.git] / drivers / gpu / drm / ttm / ttm_bo_util.c

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 398d501..db0f266 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -46,33 +46,33 @@ struct ttm_transfer_obj {
        struct ttm_buffer_object *bo;
 };
 
-int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
+int ttm_mem_io_reserve(struct ttm_device *bdev,
                       struct ttm_resource *mem)
 {
        if (mem->bus.offset || mem->bus.addr)
                return 0;
 
        mem->bus.is_iomem = false;
-       if (!bdev->driver->io_mem_reserve)
+       if (!bdev->funcs->io_mem_reserve)
                return 0;
 
-       return bdev->driver->io_mem_reserve(bdev, mem);
+       return bdev->funcs->io_mem_reserve(bdev, mem);
 }
 
-void ttm_mem_io_free(struct ttm_bo_device *bdev,
+void ttm_mem_io_free(struct ttm_device *bdev,
                     struct ttm_resource *mem)
 {
        if (!mem->bus.offset && !mem->bus.addr)
                return;
 
-       if (bdev->driver->io_mem_free)
-               bdev->driver->io_mem_free(bdev, mem);
+       if (bdev->funcs->io_mem_free)
+               bdev->funcs->io_mem_free(bdev, mem);
 
        mem->bus.offset = 0;
        mem->bus.addr = NULL;
 }
 
-static int ttm_resource_ioremap(struct ttm_bo_device *bdev,
+static int ttm_resource_ioremap(struct ttm_device *bdev,
                               struct ttm_resource *mem,
                               void **virtual)
 {
@@ -102,7 +102,7 @@ static int ttm_resource_ioremap(struct ttm_bo_device *bdev,
        return 0;
 }
 
-static void ttm_resource_iounmap(struct ttm_bo_device *bdev,
+static void ttm_resource_iounmap(struct ttm_device *bdev,
                                struct ttm_resource *mem,
                                void *virtual)
 {
@@ -172,7 +172,7 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
                       struct ttm_operation_ctx *ctx,
                       struct ttm_resource *new_mem)
 {
-       struct ttm_bo_device *bdev = bo->bdev;
+       struct ttm_device *bdev = bo->bdev;
        struct ttm_resource_manager *man = ttm_manager_type(bdev, new_mem->mem_type);
        struct ttm_tt *ttm = bo->ttm;
        struct ttm_resource *old_mem = &bo->mem;
@@ -300,7 +300,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,
         * TODO: Explicit member copy would probably be better here.
         */
 
-       atomic_inc(&ttm_bo_glob.bo_count);
+       atomic_inc(&ttm_glob.bo_count);
        INIT_LIST_HEAD(&fbo->base.ddestroy);
        INIT_LIST_HEAD(&fbo->base.lru);
        INIT_LIST_HEAD(&fbo->base.swap);
@@ -602,7 +602,7 @@ static int ttm_bo_move_to_ghost(struct ttm_buffer_object *bo,
 static void ttm_bo_move_pipeline_evict(struct ttm_buffer_object *bo,
                                       struct dma_fence *fence)
 {
-       struct ttm_bo_device *bdev = bo->bdev;
+       struct ttm_device *bdev = bo->bdev;
        struct ttm_resource_manager *from = ttm_manager_type(bdev, bo->mem.mem_type);
 
        /**
@@ -628,7 +628,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
                              bool pipeline,
                              struct ttm_resource *new_mem)
 {
-       struct ttm_bo_device *bdev = bo->bdev;
+       struct ttm_device *bdev = bo->bdev;
        struct ttm_resource_manager *from = ttm_manager_type(bdev, bo->mem.mem_type);
        struct ttm_resource_manager *man = ttm_manager_type(bdev, new_mem->mem_type);
        int ret = 0;