Merge branch 'drm-armada-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into...

[mirror_ubuntu-bionic-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..768087ddb046d1b483eb2eebafcd1298b80541fa 100644 (file)
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -212,7 +212,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 +419,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 +594,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;