From: "Simon Sandström" <simon@nikanor.nu>
To: gregkh@linuxfoundation.org
Cc: gneukum1@gmail.com, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org,
"Simon Sandström" <simon@nikanor.nu>
Subject: [PATCH 4/4] staging: kpc2000: fix brace issues in kpc2000_spi.c
Date: Tue, 25 Jun 2019 10:41:30 +0200 [thread overview]
Message-ID: <20190625084130.1107-5-simon@nikanor.nu> (raw)
In-Reply-To: <20190625084130.1107-1-simon@nikanor.nu>
Fixes checkpatch errors: "else should follow close brace '}'" and
"braces {} are not necessary for single statement blocks".
Signed-off-by: Simon Sandström <simon@nikanor.nu>
---
drivers/staging/kpc2000/kpc2000_spi.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/kpc2000/kpc2000_spi.c b/drivers/staging/kpc2000/kpc2000_spi.c
index 68b049f9ad69..4b1468137703 100644
--- a/drivers/staging/kpc2000/kpc2000_spi.c
+++ b/drivers/staging/kpc2000/kpc2000_spi.c
@@ -164,9 +164,9 @@ kp_spi_read_reg(struct kp_spi_controller_state *cs, int idx)
u64 val;
addr += idx;
- if (idx == KP_SPI_REG_CONFIG && cs->conf_cache >= 0) {
+ if (idx == KP_SPI_REG_CONFIG && cs->conf_cache >= 0)
return cs->conf_cache;
- }
+
val = readq(addr);
return val;
}
@@ -222,8 +222,7 @@ kp_spi_txrx_pio(struct spi_device *spidev, struct spi_transfer *transfer)
kp_spi_write_reg(cs, KP_SPI_REG_TXDATA, val);
processed++;
}
- }
- else if (rx) {
+ } else if (rx) {
for (i = 0 ; i < c ; i++) {
char test = 0;
@@ -261,9 +260,8 @@ kp_spi_setup(struct spi_device *spidev)
cs = spidev->controller_state;
if (!cs) {
cs = kzalloc(sizeof(*cs), GFP_KERNEL);
- if (!cs) {
+ if (!cs)
return -ENOMEM;
- }
cs->base = kpspi->base;
cs->conf_cache = -1;
spidev->controller_state = cs;
--
2.20.1
prev parent reply other threads:[~2019-06-25 8:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 8:41 [PATCH 0/4] Minor style issue fixes for staging/kpc2000 Simon Sandström
2019-06-25 8:41 ` [PATCH 1/4] staging: kpc2000: add missing spaces in kpc2000_i2c.c Simon Sandström
2019-06-25 8:41 ` [PATCH 2/4] staging: kpc2000: add missing spaces in kpc2000_spi.c Simon Sandström
2019-06-25 8:41 ` [PATCH 3/4] staging: kpc2000: remove unnecessary parentheses " Simon Sandström
2019-06-26 1:56 ` Greg KH
2019-06-25 8:41 ` Simon Sandström [this message]
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=20190625084130.1107-5-simon@nikanor.nu \
--to=simon@nikanor.nu \
--cc=devel@driverdev.osuosl.org \
--cc=gneukum1@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.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
all inboxes | Powered by JetHome®