From: Sui Jingfeng suijingfeng@loongson.cn
Trivial cleanup, no functional change.
Signed-off-by: Sui Jingfeng suijingfeng@loongson.cn --- drivers/dma-buf/dma-buf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index aa4ea8530cb3..485b022a31fa 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -777,10 +777,10 @@ static void mangle_sg_table(struct sg_table *sg_table) for_each_sgtable_sg(sg_table, sg, i) sg->page_link ^= ~0xffUL; #endif - } -static struct sg_table * __map_dma_buf(struct dma_buf_attachment *attach, - enum dma_data_direction direction) + +static struct sg_table *__map_dma_buf(struct dma_buf_attachment *attach, + enum dma_data_direction direction) { struct sg_table *sg_table; signed long ret;
From: Sui Jingfeng suijingfeng@loongson.cn
else is not generally useful after return
Signed-off-by: Sui Jingfeng suijingfeng@loongson.cn --- drivers/gpu/drm/drm_gem.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index a6208e2c089b..364e3733af98 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1150,8 +1150,8 @@ int drm_gem_pin(struct drm_gem_object *obj) { if (obj->funcs->pin) return obj->funcs->pin(obj); - else - return 0; + + return 0; }
void drm_gem_unpin(struct drm_gem_object *obj) @@ -1172,7 +1172,8 @@ int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map) ret = obj->funcs->vmap(obj, map); if (ret) return ret; - else if (iosys_map_is_null(map)) + + if (iosys_map_is_null(map)) return -ENOMEM;
return 0;
From: Sui Jingfeng suijingfeng@loongson.cn
The assignment already done in drm_client_buffer_vmap(), this patch save a copy. No functional change.
Signed-off-by: Sui Jingfeng suijingfeng@loongson.cn --- drivers/gpu/drm/drm_fbdev_generic.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_fbdev_generic.c b/drivers/gpu/drm/drm_fbdev_generic.c index 8e5148bf40bb..be4522268927 100644 --- a/drivers/gpu/drm/drm_fbdev_generic.c +++ b/drivers/gpu/drm/drm_fbdev_generic.c @@ -183,7 +183,7 @@ static int drm_fbdev_generic_damage_blit(struct drm_fb_helper *fb_helper, struct drm_clip_rect *clip) { struct drm_client_buffer *buffer = fb_helper->buffer; - struct iosys_map map, dst; + struct iosys_map map; int ret;
/* @@ -203,8 +203,7 @@ static int drm_fbdev_generic_damage_blit(struct drm_fb_helper *fb_helper, if (ret) goto out;
- dst = map; - drm_fbdev_generic_damage_blit_real(fb_helper, clip, &dst); + drm_fbdev_generic_damage_blit_real(fb_helper, clip, &map);
drm_client_buffer_vunmap(buffer);
linaro-mm-sig@lists.linaro.org
-
Sui Jingfeng