Commit 195dd40c authored by Sui Jingfeng's avatar Sui Jingfeng Committed by Thierry Reding
Browse files

drm/tegra: Remove surplus else after return

parent ff5f9ae9
Loading
Loading
Loading
Loading
+10 −9
Original line number Diff line number Diff line
@@ -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,9 +198,10 @@ 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

	if (obj->gem.import_attach)
		return dma_buf_vunmap_unlocked(obj->gem.import_attach->dmabuf, &map);

	vunmap(addr);
}