From: Joe Perches <joe@perches.com>
To: Jiri Kosina <trivial@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 14/29] media: Avoid comma separated statements
Date: Mon, 24 Aug 2020 21:56:11 -0700 [thread overview]
Message-ID: <5f2ac0ba683d4e5d3449395721788527b8487a57.1598331149.git.joe@perches.com> (raw)
In-Reply-To: <cover.1598331148.git.joe@perches.com>
Use semicolons and braces.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/media/i2c/msp3400-kthreads.c | 12 ++++++++----
drivers/media/pci/bt8xx/bttv-cards.c | 6 ++++--
drivers/media/pci/saa7134/saa7134-video.c | 7 +++++--
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/drivers/media/i2c/msp3400-kthreads.c b/drivers/media/i2c/msp3400-kthreads.c
index d3b0d1c18efd..ac8752c63266 100644
--- a/drivers/media/i2c/msp3400-kthreads.c
+++ b/drivers/media/i2c/msp3400-kthreads.c
@@ -549,8 +549,10 @@ int msp3400c_thread(void *data)
val = msp_read_dsp(client, 0x1b);
if (val > 32767)
val -= 65536;
- if (val1 < val)
- val1 = val, max1 = i;
+ if (val1 < val) {
+ val1 = val;
+ max1 = i;
+ }
dev_dbg_lvl(&client->dev, 1, msp_debug,
"carrier1 val: %5d / %s\n", val, cd[i].name);
}
@@ -586,8 +588,10 @@ int msp3400c_thread(void *data)
val = msp_read_dsp(client, 0x1b);
if (val > 32767)
val -= 65536;
- if (val2 < val)
- val2 = val, max2 = i;
+ if (val2 < val) {
+ val2 = val;
+ max2 = i;
+ }
dev_dbg_lvl(&client->dev, 1, msp_debug,
"carrier2 val: %5d / %s\n", val, cd[i].name);
}
diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c
index 16148802dabb..ca20b806e82d 100644
--- a/drivers/media/pci/bt8xx/bttv-cards.c
+++ b/drivers/media/pci/bt8xx/bttv-cards.c
@@ -3934,8 +3934,10 @@ static void osprey_eeprom(struct bttv *btv, const u8 ee[256])
if (checksum != ee[21])
return;
cardid = BTTV_BOARD_OSPREY1x0_848;
- for (i = 12; i < 21; i++)
- serial *= 10, serial += ee[i] - '0';
+ for (i = 12; i < 21; i++) {
+ serial *= 10;
+ serial += ee[i] - '0';
+ }
}
} else {
unsigned short type;
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index a8ac94fadc14..f673cda57f30 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -868,8 +868,11 @@ static int buffer_activate(struct saa7134_dev *dev,
lines_uv = dev->height >> dev->fmt->vshift;
base2 = base + bpl * dev->height;
base3 = base2 + bpl_uv * lines_uv;
- if (dev->fmt->uvswap)
- tmp = base2, base2 = base3, base3 = tmp;
+ if (dev->fmt->uvswap) {
+ tmp = base2;
+ base2 = base3;
+ base3 = tmp;
+ }
video_dbg("uv: bpl=%ld lines=%ld base2/3=%ld/%ld\n",
bpl_uv,lines_uv,base2,base3);
if (V4L2_FIELD_HAS_BOTH(dev->field)) {
--
2.26.0
next prev parent reply other threads:[~2020-08-25 4:57 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 4:55 [PATCH 00/29] treewide: Convert comma separated statements Joe Perches
2020-08-25 4:55 ` [PATCH 01/29] coding-style.rst: Avoid comma statements Joe Perches
2021-01-30 18:53 ` Joe Perches
2021-02-04 21:41 ` Jonathan Corbet
2020-08-25 4:55 ` [PATCH 02/29] alpha: Avoid comma separated statements Joe Perches
2020-08-25 6:37 ` Robert Richter
2021-01-30 18:54 ` Joe Perches
2021-02-16 14:39 ` Robert Richter
2021-02-16 15:10 ` Joe Perches
2020-08-25 4:56 ` [PATCH 03/29] ia64: " Joe Perches
2021-01-30 18:55 ` Joe Perches
2020-08-25 4:56 ` [PATCH 04/29] sparc: " Joe Perches
2021-01-30 18:56 ` Joe Perches
2020-08-25 4:56 ` [PATCH 05/29] ata: " Joe Perches
2021-01-30 18:56 ` Joe Perches
2021-01-31 15:06 ` Jens Axboe
2020-08-25 4:56 ` [PATCH 06/29] drbd: " Joe Perches
2021-01-30 18:57 ` Joe Perches
2021-01-31 15:06 ` Jens Axboe
2020-08-25 4:56 ` [PATCH 07/29] lp: " Joe Perches
2020-08-25 4:56 ` [PATCH 08/29] dma-buf: " Joe Perches
2020-08-26 15:08 ` Christian König
2020-09-03 12:21 ` Sumit Semwal
2020-09-04 11:42 ` Kieran Bingham
2020-09-04 21:33 ` Joe Perches
2021-01-30 18:47 ` Joe Perches
2021-02-03 13:26 ` Christian König
2021-01-31 17:39 ` Joe Perches
2021-01-31 17:53 ` Christian König
2021-02-01 21:54 ` Lyude Paul
2021-02-02 8:33 ` [Linaro-mm-sig] " Christian König
2021-02-02 18:24 ` Lyude Paul
2020-08-25 4:56 ` [PATCH 09/29] drm/gma500: " Joe Perches
2021-01-30 18:47 ` Joe Perches
2021-01-30 21:21 ` Patrik Jakobsson
2020-08-25 4:56 ` [PATCH 10/29] drm/i915: " Joe Perches
2021-01-30 18:47 ` Joe Perches
2021-02-01 8:41 ` Jani Nikula
2020-08-25 4:56 ` [PATCH 11/29] hwmon: (scmi-hwmon): " Joe Perches
2020-08-25 23:33 ` Guenter Roeck
2020-08-25 4:56 ` [PATCH 12/29] Input: MT - " Joe Perches
2020-08-25 17:07 ` Dmitry Torokhov
2020-08-25 4:56 ` [PATCH 13/29] bcache: " Joe Perches
2021-01-30 18:59 ` Joe Perches
2021-01-31 15:58 ` Coly Li
2020-08-25 4:56 ` Joe Perches [this message]
2020-09-04 11:45 ` [PATCH 14/29] media: " Kieran Bingham
2020-08-25 4:56 ` [PATCH 15/29] mtd: " Joe Perches
2020-09-07 7:34 ` Miquel Raynal
2020-08-25 4:56 ` [PATCH 16/29] 8390: " Joe Perches
2020-08-25 14:54 ` David Miller
2020-08-25 4:56 ` [PATCH 17/29] fs_enet: " Joe Perches
2020-08-25 14:55 ` David Miller
2020-08-25 4:56 ` [PATCH 18/29] wan: sbni: " Joe Perches
2020-08-25 14:55 ` David Miller
2020-08-25 4:56 ` [PATCH 19/29] s390/tty3270: " Joe Perches
2021-01-30 19:01 ` Joe Perches
2020-08-25 4:56 ` [PATCH 20/29] scai/arm: " Joe Perches
2020-08-25 4:56 ` [PATCH 21/29] media: atomisp: " Joe Perches
2020-09-04 11:46 ` Kieran Bingham
2020-08-25 4:56 ` [PATCH 22/29] video: fbdev: " Joe Perches
2020-09-08 11:37 ` Bartlomiej Zolnierkiewicz
2020-08-25 4:56 ` [PATCH 23/29] fuse: " Joe Perches
2021-01-30 19:04 ` Joe Perches
2021-02-01 8:12 ` Miklos Szeredi
2020-08-25 4:56 ` [PATCH 24/29] reiserfs: " Joe Perches
2021-01-30 19:04 ` Joe Perches
2020-08-25 4:56 ` [PATCH 25/29] lib/zlib: " Joe Perches
2021-01-30 19:05 ` Joe Perches
2020-08-25 4:56 ` [PATCH 26/29] lib: zstd: " Joe Perches
2021-01-30 19:06 ` Joe Perches
2020-08-25 4:56 ` [PATCH 27/29] ipv6: fib6: " Joe Perches
2020-08-25 14:55 ` David Miller
2020-08-25 4:56 ` [PATCH 28/29] sunrpc: " Joe Perches
2020-08-25 14:55 ` David Miller
2020-08-25 4:56 ` [PATCH 29/29] tools: " Joe Perches
2020-08-26 9:30 ` Thomas Renninger
2020-08-26 14:45 ` Joe Perches
2020-08-26 16:13 ` Thomas Renninger
2020-09-09 2:09 ` [PATCH 00/29] treewide: Convert " Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5f2ac0ba683d4e5d3449395721788527b8487a57.1598331149.git.joe@perches.com \
--to=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=trivial@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).