drm/tegra: switch to drm_*_get(), drm_*_put() helpers
authorCihangir Akturk <cakturk@gmail.com>
Fri, 11 Aug 2017 12:33:07 +0000 (15:33 +0300)
committerThierry Reding <treding@nvidia.com>
Thu, 17 Aug 2017 15:57:09 +0000 (17:57 +0200)
Use drm_*_get() and drm_*_put() helpers instead of drm_*_reference()
and drm_*_unreference() helpers.

drm_*_reference() and drm_*_unreference() functions are just
compatibility alias for drm_*_get() and drm_*_put() and should not be
used by new code. So convert all users of compatibility functions to
use the new APIs.

Generated by: scripts/coccinelle/api/drm-get-put.cocci

Signed-off-by: Cihangir Akturk <cakturk@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/gpu/drm/tegra/drm.c
drivers/gpu/drm/tegra/fb.c
drivers/gpu/drm/tegra/gem.c

index 518f4b69ea5335983ac3dc6d570a4b77c10d46eb..eddea778290fb3dcb5516824d85368d339fbfb84 100644 (file)
@@ -304,7 +304,7 @@ host1x_bo_lookup(struct drm_file *file, u32 handle)
        if (!gem)
                return NULL;
 
-       drm_gem_object_unreference_unlocked(gem);
+       drm_gem_object_put_unlocked(gem);
 
        bo = to_tegra_bo(gem);
        return &bo->base;
@@ -591,7 +591,7 @@ static int tegra_gem_mmap(struct drm_device *drm, void *data,
 
        args->offset = drm_vma_node_offset_addr(&bo->gem.vma_node);
 
-       drm_gem_object_unreference_unlocked(gem);
+       drm_gem_object_put_unlocked(gem);
 
        return 0;
 }
@@ -858,7 +858,7 @@ static int tegra_gem_set_tiling(struct drm_device *drm, void *data,
        bo->tiling.mode = mode;
        bo->tiling.value = value;
 
-       drm_gem_object_unreference_unlocked(gem);
+       drm_gem_object_put_unlocked(gem);
 
        return 0;
 }
@@ -898,7 +898,7 @@ static int tegra_gem_get_tiling(struct drm_device *drm, void *data,
                break;
        }
 
-       drm_gem_object_unreference_unlocked(gem);
+       drm_gem_object_put_unlocked(gem);
 
        return err;
 }
@@ -923,7 +923,7 @@ static int tegra_gem_set_flags(struct drm_device *drm, void *data,
        if (args->flags & DRM_TEGRA_GEM_BOTTOM_UP)
                bo->flags |= TEGRA_BO_BOTTOM_UP;
 
-       drm_gem_object_unreference_unlocked(gem);
+       drm_gem_object_put_unlocked(gem);
 
        return 0;
 }
@@ -945,7 +945,7 @@ static int tegra_gem_get_flags(struct drm_device *drm, void *data,
        if (bo->flags & TEGRA_BO_BOTTOM_UP)
                args->flags |= DRM_TEGRA_GEM_BOTTOM_UP;
 
-       drm_gem_object_unreference_unlocked(gem);
+       drm_gem_object_put_unlocked(gem);
 
        return 0;
 }
index 25acb73ee728f31769c487132a00d85765e9629c..80540c1c66dc3de5385ac4e41dc7d1ca7fd5af85 100644 (file)
@@ -88,7 +88,7 @@ static void tegra_fb_destroy(struct drm_framebuffer *framebuffer)
                        if (bo->pages)
                                vunmap(bo->vaddr);
 
-                       drm_gem_object_unreference_unlocked(&bo->gem);
+                       drm_gem_object_put_unlocked(&bo->gem);
                }
        }
 
@@ -195,7 +195,7 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm,
 
 unreference:
        while (i--)
-               drm_gem_object_unreference_unlocked(&planes[i]->gem);
+               drm_gem_object_put_unlocked(&planes[i]->gem);
 
        return ERR_PTR(err);
 }
@@ -242,7 +242,7 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper,
        info = drm_fb_helper_alloc_fbi(helper);
        if (IS_ERR(info)) {
                dev_err(drm->dev, "failed to allocate framebuffer info\n");
-               drm_gem_object_unreference_unlocked(&bo->gem);
+               drm_gem_object_put_unlocked(&bo->gem);
                return PTR_ERR(info);
        }
 
@@ -251,7 +251,7 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper,
                err = PTR_ERR(fbdev->fb);
                dev_err(drm->dev, "failed to allocate DRM framebuffer: %d\n",
                        err);
-               drm_gem_object_unreference_unlocked(&bo->gem);
+               drm_gem_object_put_unlocked(&bo->gem);
                return PTR_ERR(fbdev->fb);
        }
 
index 7a39a355678a444d1cf1477ee932339169006957..fe77bcd23800e20e44830b24aeeb91cc21077fe1 100644 (file)
@@ -24,7 +24,7 @@ static void tegra_bo_put(struct host1x_bo *bo)
 {
        struct tegra_bo *obj = host1x_to_tegra_bo(bo);
 
-       drm_gem_object_unreference_unlocked(&obj->gem);
+       drm_gem_object_put_unlocked(&obj->gem);
 }
 
 static dma_addr_t tegra_bo_pin(struct host1x_bo *bo, struct sg_table **sgt)
@@ -95,7 +95,7 @@ static struct host1x_bo *tegra_bo_get(struct host1x_bo *bo)
 {
        struct tegra_bo *obj = host1x_to_tegra_bo(bo);
 
-       drm_gem_object_reference(&obj->gem);
+       drm_gem_object_get(&obj->gem);
 
        return bo;
 }
@@ -325,7 +325,7 @@ struct tegra_bo *tegra_bo_create_with_handle(struct drm_file *file,
                return ERR_PTR(err);
        }
 
-       drm_gem_object_unreference_unlocked(&bo->gem);
+       drm_gem_object_put_unlocked(&bo->gem);
 
        return bo;
 }
@@ -439,7 +439,7 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,
 
        *offset = drm_vma_node_offset_addr(&bo->gem.vma_node);
 
-       drm_gem_object_unreference_unlocked(gem);
+       drm_gem_object_put_unlocked(gem);
 
        return 0;
 }
@@ -654,7 +654,7 @@ struct drm_gem_object *tegra_gem_prime_import(struct drm_device *drm,
                struct drm_gem_object *gem = buf->priv;
 
                if (gem->dev == drm) {
-                       drm_gem_object_reference(gem);
+                       drm_gem_object_get(gem);
                        return gem;
                }
        }