Skip to content

Commit 195dd40

Browse files
Sui Jingfengthierryreding
authored andcommitted
drm/tegra: Remove surplus else after return
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
1 parent ff5f9ae commit 195dd40

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

  • drivers/gpu/drm/tegra

drivers/gpu/drm/tegra/gem.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,15 @@ static void *tegra_bo_mmap(struct host1x_bo *bo)
180180
struct iosys_map map;
181181
int ret;
182182

183-
if (obj->vaddr) {
183+
if (obj->vaddr)
184184
return obj->vaddr;
185-
} else if (obj->gem.import_attach) {
185+
186+
if (obj->gem.import_attach) {
186187
ret = dma_buf_vmap_unlocked(obj->gem.import_attach->dmabuf, &map);
187188
return ret ? NULL : map.vaddr;
188-
} else {
189-
return vmap(obj->pages, obj->num_pages, VM_MAP,
190-
pgprot_writecombine(PAGE_KERNEL));
191189
}
190+
191+
return vmap(obj->pages, obj->num_pages, VM_MAP, pgprot_writecombine(PAGE_KERNEL));
192192
}
193193

194194
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)
198198

199199
if (obj->vaddr)
200200
return;
201-
else if (obj->gem.import_attach)
202-
dma_buf_vunmap_unlocked(obj->gem.import_attach->dmabuf, &map);
203-
else
204-
vunmap(addr);
201+
202+
if (obj->gem.import_attach)
203+
return dma_buf_vunmap_unlocked(obj->gem.import_attach->dmabuf, &map);
204+
205+
vunmap(addr);
205206
}
206207

207208
static struct host1x_bo *tegra_bo_get(struct host1x_bo *bo)

0 commit comments

Comments
 (0)