2020-08-25 05:07:56

by Joe Perches

[permalink] [raw]
Subject: [PATCH 22/29] video: fbdev: Avoid comma separated statements

Use semicolons and braces.

Signed-off-by: Joe Perches <[email protected]>
---
drivers/video/fbdev/tgafb.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/video/fbdev/tgafb.c b/drivers/video/fbdev/tgafb.c
index e9869135d833..666fbe2f671c 100644
--- a/drivers/video/fbdev/tgafb.c
+++ b/drivers/video/fbdev/tgafb.c
@@ -989,8 +989,10 @@ tgafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
/* We can fill 2k pixels per operation. Notice blocks that fit
the width of the screen so that we can take advantage of this
and fill more than one line per write. */
- if (width == line_length)
- width *= height, height = 1;
+ if (width == line_length) {
+ width *= height;
+ height = 1;
+ }

/* The write into the frame buffer must be aligned to 4 bytes,
but we are allowed to encode the offset within the word in
@@ -1171,8 +1173,10 @@ copyarea_8bpp(struct fb_info *info, u32 dx, u32 dy, u32 sx, u32 sy,
More than anything else, these control how we do copies. */
depos = dy * line_length + dx;
sepos = sy * line_length + sx;
- if (backward)
- depos += width, sepos += width;
+ if (backward) {
+ depos += width;
+ sepos += width;
+ }

/* Next copy full words at a time. */
n32 = width / 32;
--
2.26.0


Subject: Re: [PATCH 22/29] video: fbdev: Avoid comma separated statements


On 8/25/20 6:56 AM, Joe Perches wrote:
> Use semicolons and braces.
>
> Signed-off-by: Joe Perches <[email protected]>

Applied to drm-misc-next tree, thanks.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

> ---
> drivers/video/fbdev/tgafb.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/video/fbdev/tgafb.c b/drivers/video/fbdev/tgafb.c
> index e9869135d833..666fbe2f671c 100644
> --- a/drivers/video/fbdev/tgafb.c
> +++ b/drivers/video/fbdev/tgafb.c
> @@ -989,8 +989,10 @@ tgafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
> /* We can fill 2k pixels per operation. Notice blocks that fit
> the width of the screen so that we can take advantage of this
> and fill more than one line per write. */
> - if (width == line_length)
> - width *= height, height = 1;
> + if (width == line_length) {
> + width *= height;
> + height = 1;
> + }
>
> /* The write into the frame buffer must be aligned to 4 bytes,
> but we are allowed to encode the offset within the word in
> @@ -1171,8 +1173,10 @@ copyarea_8bpp(struct fb_info *info, u32 dx, u32 dy, u32 sx, u32 sy,
> More than anything else, these control how we do copies. */
> depos = dy * line_length + dx;
> sepos = sy * line_length + sx;
> - if (backward)
> - depos += width, sepos += width;
> + if (backward) {
> + depos += width;
> + sepos += width;
> + }
>
> /* Next copy full words at a time. */
> n32 = width / 32;
>