2023-06-26 15:10:21

by Sui Jingfeng

[permalink] [raw]

Subject: [PATCH 2/2] drm/tegra: Remove surplus else after return

---

else is not generally useful after return

Signed-off-by: Sui Jingfeng <[email protected]>
---
drivers/gpu/drm/tegra/gem.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 0ce22935fbd3..26d64f4545bd 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -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)
--
2.25.1

2023-10-10 15:28:58

by Thierry Reding

[permalink] [raw]

Subject: Re: [PATCH 2/2] drm/tegra: Remove surplus else after return

---

On Mon, Jun 26, 2023 at 10:33:31PM +0800, Sui Jingfeng wrote:
> else is not generally useful after return
>
> Signed-off-by: Sui Jingfeng <[email protected]>
> ---
> drivers/gpu/drm/tegra/gem.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)

Applied, thanks.

Thierry

---

Attachments:

(No filename) (317.00 B)
signature.asc (849.00 B)
Download all attachments