From: Joe Perches <joe@perches.com>
To: Jiri Kosina <trivial@kernel.org>, Robert Richter <rric@kernel.org>
Cc: Richard Henderson <rth@twiddle.net>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Matt Turner <mattst88@gmail.com>,
linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org,
oprofile-list@lists.sf.net
Subject: [PATCH 02/29] alpha: Avoid comma separated statements
Date: Mon, 24 Aug 2020 21:55:59 -0700 [thread overview]
Message-ID: <4facd57f80c70437f085ba3a1bcf13ae0b63c3bc.1598331148.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>
---
arch/alpha/kernel/pci_iommu.c | 8 +++++---
arch/alpha/oprofile/op_model_ev4.c | 22 ++++++++++++++--------
arch/alpha/oprofile/op_model_ev5.c | 8 +++++---
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index 81037907268d..b8af7ad6c607 100644
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -161,10 +161,12 @@ iommu_arena_find_pages(struct device *dev, struct pci_iommu_arena *arena,
goto again;
}
- if (ptes[p+i])
- p = ALIGN(p + i + 1, mask + 1), i = 0;
- else
+ if (ptes[p+i]) {
+ p = ALIGN(p + i + 1, mask + 1);
+ i = 0;
+ } else {
i = i + 1;
+ }
}
if (i < n) {
diff --git a/arch/alpha/oprofile/op_model_ev4.c b/arch/alpha/oprofile/op_model_ev4.c
index 086a0d5445c5..004f80a4291f 100644
--- a/arch/alpha/oprofile/op_model_ev4.c
+++ b/arch/alpha/oprofile/op_model_ev4.c
@@ -46,18 +46,24 @@ ev4_reg_setup(struct op_register_config *reg,
map it onto one of the possible values, and write it back. */
count = ctr[0].count;
- if (count <= 4096)
- count = 4096, hilo = 1;
- else
- count = 65536, hilo = 0;
+ if (count <= 4096) {
+ count = 4096;
+ hilo = 1;
+ } else {
+ count = 65536;
+ hilo = 0;
+ }
ctr[0].count = count;
ctl |= (ctr[0].enabled && hilo) << 3;
count = ctr[1].count;
- if (count <= 256)
- count = 256, hilo = 1;
- else
- count = 4096, hilo = 0;
+ if (count <= 256) {
+ count = 256;
+ hilo = 1;
+ } else {
+ count = 4096;
+ hilo = 0;
+ }
ctr[1].count = count;
ctl |= (ctr[1].enabled && hilo);
diff --git a/arch/alpha/oprofile/op_model_ev5.c b/arch/alpha/oprofile/op_model_ev5.c
index c300f5ef3482..6f52244e1181 100644
--- a/arch/alpha/oprofile/op_model_ev5.c
+++ b/arch/alpha/oprofile/op_model_ev5.c
@@ -92,9 +92,11 @@ common_reg_setup(struct op_register_config *reg,
if (!ctr[i].enabled)
continue;
- if (count <= 256)
- count = 256, hilo = 3, max = 256;
- else {
+ if (count <= 256) {
+ max = 256;
+ hilo = 3;
+ count = 256;
+ } else {
max = (i == 2 ? 16384 : 65536);
hilo = 2;
if (count > max)
--
2.26.0
next prev parent reply other threads:[~2020-08-25 4:59 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 ` Joe Perches [this message]
2020-08-25 6:37 ` [PATCH 02/29] alpha: Avoid comma separated statements 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 ` [PATCH 14/29] media: " Joe Perches
2020-09-04 11:45 ` 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=4facd57f80c70437f085ba3a1bcf13ae0b63c3bc.1598331148.git.joe@perches.com \
--to=joe@perches.com \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mattst88@gmail.com \
--cc=oprofile-list@lists.sf.net \
--cc=rric@kernel.org \
--cc=rth@twiddle.net \
--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).