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