1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/gpu/drm/nouveau/nvc0_vram.c b/drivers/gpu/drm/nouveau/nvc0_vram.c
index b2ef210ae54d..6d777a2a04dd 100644
--- a/drivers/gpu/drm/nouveau/nvc0_vram.c
+++ b/drivers/gpu/drm/nouveau/nvc0_vram.c
@@ -58,46 +58,46 @@ nvc0_vram_flags_valid(struct drm_device *dev, u32 tile_flags)
 
 int
 nvc0_vram_new(struct drm_device *dev, u64 size, u32 align, u32 ncmin,
-              u32 type, struct nouveau_vram **pvram)
+              u32 type, struct nouveau_mem **pmem)
 {
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct ttm_bo_device *bdev = &dev_priv->ttm.bdev;
         struct ttm_mem_type_manager *man = &bdev->man[TTM_PL_VRAM];
         struct nouveau_mm *mm = man->priv;
         struct nouveau_mm_node *r;
-        struct nouveau_vram *vram;
+        struct nouveau_mem *mem;
         int ret;
 
         size  >>= 12;
         align >>= 12;
         ncmin >>= 12;
 
-        vram = kzalloc(sizeof(*vram), GFP_KERNEL);
-        if (!vram)
+        mem = kzalloc(sizeof(*mem), GFP_KERNEL);
+        if (!mem)
                 return -ENOMEM;
 
-        INIT_LIST_HEAD(&vram->regions);
-        vram->dev = dev_priv->dev;
-        vram->memtype = type;
-        vram->size = size;
+        INIT_LIST_HEAD(&mem->regions);
+        mem->dev = dev_priv->dev;
+        mem->memtype = type;
+        mem->size = size;
 
         mutex_lock(&mm->mutex);
         do {
                 ret = nouveau_mm_get(mm, 1, size, ncmin, align, &r);
                 if (ret) {
                         mutex_unlock(&mm->mutex);
-                        nv50_vram_del(dev, &vram);
+                        nv50_vram_del(dev, &mem);
                         return ret;
                 }
 
-                list_add_tail(&r->rl_entry, &vram->regions);
+                list_add_tail(&r->rl_entry, &mem->regions);
                 size -= r->length;
         } while (size);
         mutex_unlock(&mm->mutex);
 
-        r = list_first_entry(&vram->regions, struct nouveau_mm_node, rl_entry);
-        vram->offset = (u64)r->offset << 12;
-        *pvram = vram;
+        r = list_first_entry(&mem->regions, struct nouveau_mm_node, rl_entry);
+        mem->offset = (u64)r->offset << 12;
+        *pmem = mem;
         return 0;
 }