mm: use vmf->address instead of of vmf->virtual_address

[mirror_ubuntu-jammy-kernel.git] / drivers / gpu / drm / armada / armada_gem.c

diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index 8067918973046a14441ecef699f5b3337f17ecbf..a293c8be232c41c7c133b95445801a56844c2e92 100644 (file)
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -17,12 +17,11 @@
 static int armada_gem_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
        struct armada_gem_object *obj = drm_to_armada_gem(vma->vm_private_data);
-       unsigned long addr = (unsigned long)vmf->virtual_address;
        unsigned long pfn = obj->phys_addr >> PAGE_SHIFT;
        int ret;
 
-       pfn += (addr - vma->vm_start) >> PAGE_SHIFT;
-       ret = vm_insert_pfn(vma, addr, pfn);
+       pfn += (vmf->address - vma->vm_start) >> PAGE_SHIFT;
+       ret = vm_insert_pfn(vma, vmf->address, pfn);
 
        switch (ret) {
        case 0:
@@ -212,7 +211,7 @@ armada_gem_alloc_private_object(struct drm_device *dev, size_t size)
        return obj;
 }
 
-struct armada_gem_object *armada_gem_alloc_object(struct drm_device *dev,
+static struct armada_gem_object *armada_gem_alloc_object(struct drm_device *dev,
        size_t size)
 {
        struct armada_gem_object *obj;
@@ -419,7 +418,7 @@ int armada_gem_pwrite_ioctl(struct drm_device *dev, void *data,
 }
 
 /* Prime support */
-struct sg_table *
+static struct sg_table *
 armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach,
        enum dma_data_direction dir)
 {
@@ -594,11 +593,7 @@ int armada_gem_map_import(struct armada_gem_object *dobj)
        int ret;
 
        dobj->sgt = dma_buf_map_attachment(dobj->obj.import_attach,
-                                         DMA_TO_DEVICE);
-       if (!dobj->sgt) {
-               DRM_ERROR("dma_buf_map_attachment() returned NULL\n");
-               return -EINVAL;
-       }
+                                          DMA_TO_DEVICE);
        if (IS_ERR(dobj->sgt)) {
                ret = PTR_ERR(dobj->sgt);
                dobj->sgt = NULL;