Skip to content

Commit

Permalink
drm/tegra: Remove surplus else after return
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Sui Jingfeng authored and Thierry Reding committed Oct 11, 2023
1 parent ff5f9ae commit 195dd40
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions drivers/gpu/drm/tegra/gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit 195dd40

Please sign in to comment.