drm/tegra: Remove surplus else after return
authorSui Jingfeng <suijingfeng@loongson.cn>
Mon, 26 Jun 2023 14:33:31 +0000 (22:33 +0800)
committerThierry Reding <treding@nvidia.com>
Wed, 11 Oct 2023 20:52:43 +0000 (22:52 +0200)
else is not generally useful after return

Signed-off-by: Sui Jingfeng <suijingfeng@loongson.cn>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230626143331.640454-2-suijingfeng@loongson.cn
drivers/gpu/drm/tegra/gem.c

index a4023163493dca2a2f8c42a58184cbcbc656c9ae..11296de59c5a8ff5e862d24d0b760f8c7c39884f 100644 (file)
@@ -180,15 +180,15 @@ static void *tegra_bo_mmap(struct host1x_bo *bo)
        struct iosys_map map;
        int ret;
 
-       if (obj->vaddr) {
+       if (obj->vaddr)
                return obj->vaddr;
-       } else if (obj->gem.import_attach) {
+
+       if (obj->gem.import_attach) {
                ret = dma_buf_vmap_unlocked(obj->gem.import_attach->dmabuf, &map);
                return ret ? NULL : map.vaddr;
-       } else {
-               return vmap(obj->pages, obj->num_pages, VM_MAP,
-                           pgprot_writecombine(PAGE_KERNEL));
        }
+
+       return vmap(obj->pages, obj->num_pages, VM_MAP, pgprot_writecombine(PAGE_KERNEL));
 }
 
 static void tegra_bo_munmap(struct host1x_bo *bo, void *addr)
@@ -198,10 +198,11 @@ static void tegra_bo_munmap(struct host1x_bo *bo, void *addr)
 
        if (obj->vaddr)
                return;
-       else if (obj->gem.import_attach)
-               dma_buf_vunmap_unlocked(obj->gem.import_attach->dmabuf, &map);
-       else
-               vunmap(addr);
+
+       if (obj->gem.import_attach)
+               return dma_buf_vunmap_unlocked(obj->gem.import_attach->dmabuf, &map);
+
+       vunmap(addr);
 }
 
 static struct host1x_bo *tegra_bo_get(struct host1x_bo *bo)