drm/etnaviv: change return type of etnaviv_gem_obj_add to void

This function never fails, as it does nothing more than adding the GEM
object to the global device list. Making this explicit through the void
return type allows to drop some unnecessary error handling.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index f75105b7e1a4139db313882c6fd214ace47346fd..a52220eeee45ed740d4221b3e1070c0be6c0a708 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -586,7 +586,7 @@ void etnaviv_gem_free_object(struct drm_gem_object *obj)
        kfree(etnaviv_obj);
 }
 
-int etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj)
+void etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj)
 {
        struct etnaviv_drm_private *priv = dev->dev_private;
        struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
@@ -594,8 +594,6 @@ int etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj)
        mutex_lock(&priv->gem_lock);
        list_add_tail(&etnaviv_obj->gem_node, &priv->gem_list);
        mutex_unlock(&priv->gem_lock);
-
-       return 0;
 }
 
 static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flags,
@@ -678,11 +676,7 @@ int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file,
        if (ret)
                goto fail;
 
-       ret = etnaviv_gem_obj_add(dev, obj);
-       if (ret < 0) {
-               drm_gem_object_put_unlocked(obj);
-               return ret;
-       }
+       etnaviv_gem_obj_add(dev, obj);
 
        ret = drm_gem_handle_create(file, obj, handle);
 
@@ -895,12 +889,10 @@ int etnaviv_gem_new_userptr(struct drm_device *dev, struct drm_file *file,
        etnaviv_obj->userptr.ro = !(flags & ETNA_USERPTR_WRITE);
        get_task_struct(current);
 
-       ret = etnaviv_gem_obj_add(dev, &etnaviv_obj->base);
-       if (ret)
-               goto unreference;
+       etnaviv_gem_obj_add(dev, &etnaviv_obj->base);
 
        ret = drm_gem_handle_create(file, &etnaviv_obj->base, handle);
-unreference:
+
        /* drop reference from allocate - handle holds it now */
        drm_gem_object_put_unlocked(&etnaviv_obj->base);
        return ret;

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.h b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
index e437fba1209d925cca7bf7f33b5651c3eeeda21a..00bd9c851a02c4d0752824b1a869f8029cfe142d 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
@@ -117,7 +117,7 @@ int etnaviv_gem_wait_bo(struct etnaviv_gpu *gpu, struct drm_gem_object *obj,
 int etnaviv_gem_new_private(struct drm_device *dev, size_t size, u32 flags,
        struct reservation_object *robj, const struct etnaviv_gem_ops *ops,
        struct etnaviv_gem_object **res);
-int etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj);
+void etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj);
 struct page **etnaviv_gem_get_pages(struct etnaviv_gem_object *obj);
 void etnaviv_gem_put_pages(struct etnaviv_gem_object *obj);
 

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
index ea87bf87b187f4cf139546a6a19846d2d1aa986a..5704305d41e69f57466ded0628f37be669304fbd 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
@@ -142,9 +142,7 @@ struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev,
        if (ret)
                goto fail;
 
-       ret = etnaviv_gem_obj_add(dev, &etnaviv_obj->base);
-       if (ret)
-               goto fail;
+       etnaviv_gem_obj_add(dev, &etnaviv_obj->base);
 
        return &etnaviv_obj->base;