diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2018-11-20 19:20:02 +0300 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-11-21 11:12:45 +0300 |
| commit | 76a57db4a867ade779fbe292112cb6d7f0762e4e (patch) | |
| tree | 8ad5dc59c7b7f73843440d722f5c5aab31cc1fd7 /drivers | |
| parent | a071a8ff1f5fd4aa6897c9260be548029b3acaff (diff) | |
| download | linux-76a57db4a867ade779fbe292112cb6d7f0762e4e.tar.xz | |
qxl: No need for NULL check before calling qxl_bo_unref()
qxl_bo_unref() is already performing a NULL check.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20181120162004.22807-1-cfergeau@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_display.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_draw.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_kms.c | 6 |
3 files changed, 4 insertions, 9 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index 2ce9a8dcec84..d491ba27bbc8 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -670,9 +670,7 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane, qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false); qxl_release_fence_buffer_objects(release); - if (old_cursor_bo) - qxl_bo_unref(&old_cursor_bo); - + qxl_bo_unref(&old_cursor_bo); qxl_bo_unref(&cursor_bo); return; diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c index c34e45662965..c408bb83c7a9 100644 --- a/drivers/gpu/drm/qxl/qxl_draw.c +++ b/drivers/gpu/drm/qxl/qxl_draw.c @@ -247,8 +247,7 @@ void qxl_draw_opaque_fb(const struct qxl_fb_image *qxl_fb_image, qxl_release_fence_buffer_objects(release); out_free_palette: - if (palette_bo) - qxl_bo_unref(&palette_bo); + qxl_bo_unref(&palette_bo); out_free_image: qxl_image_free_objects(qdev, dimage); out_free_drawable: diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index f6975d7c7d10..15238a413f9d 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c @@ -313,10 +313,8 @@ error: void qxl_device_fini(struct qxl_device *qdev) { - if (qdev->current_release_bo[0]) - qxl_bo_unref(&qdev->current_release_bo[0]); - if (qdev->current_release_bo[1]) - qxl_bo_unref(&qdev->current_release_bo[1]); + qxl_bo_unref(&qdev->current_release_bo[0]); + qxl_bo_unref(&qdev->current_release_bo[1]); flush_work(&qdev->gc_work); qxl_ring_free(qdev->command_ring); qxl_ring_free(qdev->cursor_ring); |