2020-09-21 13:11:57

by Qinglang Miao

Subject: [PATCH -next] drm/qxl: simplify the return expression of qxl_plane_prepare_fb()

Simplify the return expression.

Signed-off-by: Qinglang Miao <[email protected]>
---
drivers/gpu/drm/qxl/qxl_display.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 6063f3a15..65de1f69a 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -768,7 +768,6 @@ static int qxl_plane_prepare_fb(struct drm_plane *plane,
struct drm_gem_object *obj;
struct qxl_bo *user_bo;
struct qxl_surface surf;
- int ret;

if (!new_state->fb)
return 0;
@@ -804,11 +803,7 @@ static int qxl_plane_prepare_fb(struct drm_plane *plane,
}
}

- ret = qxl_bo_pin(user_bo);
- if (ret)
- return ret;
-
- return 0;
+ return qxl_bo_pin(user_bo);
}

static void qxl_plane_cleanup_fb(struct drm_plane *plane,
--
2.23.0

2020-09-29 09:34:47

by Gerd Hoffmann

Subject: Re: [PATCH -next] drm/qxl: simplify the return expression of qxl_plane_prepare_fb()

On Mon, Sep 21, 2020 at 09:10:22PM +0800, Qinglang Miao wrote:
> Simplify the return expression.

Pushed to drm-misc-next.

thanks,
Gerd