drm/nouveau: s/mem/reg/ for struct ttm_mem_reg variables

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / nouveau_sgdma.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index 8da005b7a75b2b5651e06a0ba675f9ec24e0fd00..b7ab268f7d6f59db8b31087b4eff92421beea653 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@ -24,10 +24,10 @@ nouveau_sgdma_destroy(struct ttm_tt *ttm)
 }
 
 static int
-nv04_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem)
+nv04_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *reg)
 {
        struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;
-       struct nvkm_mem *node = mem->mm_node;
+       struct nvkm_mem *node = reg->mm_node;
 
        if (ttm->sg) {
                node->sg    = ttm->sg;
@@ -36,7 +36,7 @@ nv04_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem)
                node->sg    = NULL;
                node->pages = nvbe->ttm.dma_address;
        }
-       node->size = (mem->num_pages << PAGE_SHIFT) >> 12;
+       node->size = (reg->num_pages << PAGE_SHIFT) >> 12;
 
        nvkm_vm_map(&node->vma[0], node);
        nvbe->node = node;
@@ -58,10 +58,10 @@ static struct ttm_backend_func nv04_sgdma_backend = {
 };
 
 static int
-nv50_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem)
+nv50_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *reg)
 {
        struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;
-       struct nvkm_mem *node = mem->mm_node;
+       struct nvkm_mem *node = reg->mm_node;
 
        /* noop: bound in move_notify() */
        if (ttm->sg) {
@@ -71,7 +71,7 @@ nv50_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem)
                node->sg    = NULL;
                node->pages = nvbe->ttm.dma_address;
        }
-       node->size = (mem->num_pages << PAGE_SHIFT) >> 12;
+       node->size = (reg->num_pages << PAGE_SHIFT) >> 12;
        return 0;
 }