aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2018-11-09 22:44:46 -0500
committerGerd Hoffmann <kraxel@redhat.com>2018-11-14 08:21:04 -0500
commit45230903ecd4068b3f3fd4ea271c525048655ce8 (patch)
tree3bf3d1ff6091f6f9deb6c325ebb0cab50aa187e5 /drivers
parent040b595a91b21b61d6e0d388394b79c85f614e7c (diff)
drm/qxl: remove set but not used variable 'map'
Fixes gcc '-Wunused-but-set-variable' warning: drivers/gpu/drm/qxl/qxl_object.c: In function 'qxl_bo_kunmap_atomic_page': drivers/gpu/drm/qxl/qxl_object.c:189:21: warning: variable 'map' set but not used [-Wunused-but-set-variable] Signed-off-by: YueHaibing <yuehaibing@huawei.com> Link: http://patchwork.freedesktop.org/patch/msgid/1541821486-40631-1-git-send-email-yuehaibing@huawei.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/qxl/qxl_object.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c
index f67a3c535afb..b1706cb9742a 100644
--- a/drivers/gpu/drm/qxl/qxl_object.c
+++ b/drivers/gpu/drm/qxl/qxl_object.c
@@ -186,13 +186,9 @@ void qxl_bo_kunmap_atomic_page(struct qxl_device *qdev,
186 struct qxl_bo *bo, void *pmap) 186 struct qxl_bo *bo, void *pmap)
187{ 187{
188 struct ttm_mem_type_manager *man = &bo->tbo.bdev->man[bo->tbo.mem.mem_type]; 188 struct ttm_mem_type_manager *man = &bo->tbo.bdev->man[bo->tbo.mem.mem_type];
189 struct io_mapping *map;
190 189
191 if (bo->tbo.mem.mem_type == TTM_PL_VRAM) 190 if ((bo->tbo.mem.mem_type != TTM_PL_VRAM) &&
192 map = qdev->vram_mapping; 191 (bo->tbo.mem.mem_type != TTM_PL_PRIV))
193 else if (bo->tbo.mem.mem_type == TTM_PL_PRIV)
194 map = qdev->surface_mapping;
195 else
196 goto fallback; 192 goto fallback;
197 193
198 io_mapping_unmap_atomic(pmap); 194 io_mapping_unmap_atomic(pmap);
@@ -200,7 +196,7 @@ void qxl_bo_kunmap_atomic_page(struct qxl_device *qdev,
200 (void) ttm_mem_io_lock(man, false); 196 (void) ttm_mem_io_lock(man, false);
201 ttm_mem_io_free(bo->tbo.bdev, &bo->tbo.mem); 197 ttm_mem_io_free(bo->tbo.bdev, &bo->tbo.mem);
202 ttm_mem_io_unlock(man); 198 ttm_mem_io_unlock(man);
203 return ; 199 return;
204 fallback: 200 fallback:
205 qxl_bo_kunmap(bo); 201 qxl_bo_kunmap(bo);
206} 202}