mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Fabian Krueger <fabian.krueger@fau.de>
To: unlisted-recipients:; (no To-header on input)
Cc: <fabian.krueger@fau.de>,
	Michael Scheiderer <michael.scheiderer@fau.de>,
	<linux-kernel@i4.cs.fau.de>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	<devel@driverdev.osuosl.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/8] staging: kpc2000: remove unnecessary brackets
Date: Wed, 26 Jun 2019 09:35:22 +0200	[thread overview]
Message-ID: <20190626073531.8946-5-fabian.krueger@fau.de> (raw)
In-Reply-To: <20190626073531.8946-1-fabian.krueger@fau.de>

Removed brackets on around one-lined if-cases.
This refactoring makes the code more readable.

Signed-off-by: Fabian Krueger <fabian.krueger@fau.de>
Signed-off-by: Michael Scheiderer <michael.scheiderer@fau.de>
Cc: <linux-kernel@i4.cs.fau.de>
---
 drivers/staging/kpc2000/kpc2000_spi.c | 30 +++++++++------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/drivers/staging/kpc2000/kpc2000_spi.c b/drivers/staging/kpc2000/kpc2000_spi.c
index 42d32de2230e..b4dba0e42c72 100644
--- a/drivers/staging/kpc2000/kpc2000_spi.c
+++ b/drivers/staging/kpc2000/kpc2000_spi.c
@@ -165,9 +165,8 @@ 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;
 }
@@ -192,11 +191,10 @@ kp_spi_wait_for_reg_bit(struct kp_spi_controller_state *cs, int idx,
 	timeout = jiffies + msecs_to_jiffies(1000);
 	while (!(kp_spi_read_reg(cs, idx) & bit)) {
 		if (time_after(jiffies, timeout)) {
-			if (!(kp_spi_read_reg(cs, idx) & bit)) {
+			if (!(kp_spi_read_reg(cs, idx) & bit))
 				return -ETIMEDOUT;
-			} else {
+			else
 				return 0;
-			}
 		}
 		cpu_relax();
 	}
@@ -305,9 +303,8 @@ kp_spi_transfer_one_message(struct spi_master *master, struct spi_message *m)
 	cs = spidev->controller_state;
 
 	/* reject invalid messages and transfers */
-	if (list_empty(&m->transfers)) {
+	if (list_empty(&m->transfers))
 		return -EINVAL;
-	}
 
 	/* validate input */
 	list_for_each_entry(transfer, &m->transfers, transfer_list) {
@@ -365,17 +362,14 @@ kp_spi_transfer_one_message(struct spi_master *master, struct spi_message *m)
 			sc.reg = kp_spi_read_reg(cs, KP_SPI_REG_CONFIG);
 
 			/* ...direction */
-			if (transfer->tx_buf) {
+			if (transfer->tx_buf)
 				sc.bitfield.trm = KP_SPI_REG_CONFIG_TRM_TX;
-			}
-			else if (transfer->rx_buf) {
+			else if (transfer->rx_buf)
 				sc.bitfield.trm = KP_SPI_REG_CONFIG_TRM_RX;
-			}
 
 			/* ...word length */
-			if (transfer->bits_per_word) {
+			if (transfer->bits_per_word)
 				word_len = transfer->bits_per_word;
-			}
 			sc.bitfield.wl = word_len-1;
 
 			/* ...chip select */
@@ -394,9 +388,8 @@ kp_spi_transfer_one_message(struct spi_master *master, struct spi_message *m)
 			}
 		}
 
-		if (transfer->delay_usecs) {
+		if (transfer->delay_usecs)
 			udelay(transfer->delay_usecs);
-		}
 	}
 
 	/* de-assert chip select to end the sequence */
@@ -419,9 +412,7 @@ kp_spi_cleanup(struct spi_device *spidev)
 {
 	struct kp_spi_controller_state *cs = spidev->controller_state;
 
-	if (cs) {
-		kfree(cs);
-	}
+	kfree(cs);
 }
 
 /******************
@@ -463,9 +454,8 @@ kp_spi_probe(struct platform_device *pldev)
 	kpspi->dev = &pldev->dev;
 
 	master->num_chipselect = 4;
-	if (pldev->id != -1) {
+	if (pldev->id != -1)
 		master->bus_num = pldev->id;
-	}
 
 	r = platform_get_resource(pldev, IORESOURCE_MEM, 0);
 	if (r == NULL) {
-- 
2.17.1


  parent reply	other threads:[~2019-06-26  7:36 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-25 11:27 [PATCH 0/8] staging: kpc2000: style refactoring Fabian Krueger
2019-06-25 11:27 ` [PATCH 1/8] staging: kpc2000: add line breaks Fabian Krueger
2019-06-25 11:52   ` Dan Carpenter
2019-06-26  7:35     ` [PATCH 0/8] staging: kpc2000: style refactoring Fabian Krueger
2019-06-26  7:35       ` [PATCH 1/8] staging: kpc2000: add line breaks Fabian Krueger
2019-07-01  8:41         ` Greg Kroah-Hartman
2019-06-26  7:35       ` [PATCH 2/8] staging: kpc2000: blank lines after declaration Fabian Krueger
2019-06-26  7:35       ` [PATCH 3/8] staging: kpc2000: introduce usage of __packed Fabian Krueger
2019-06-26  7:35       ` Fabian Krueger [this message]
2019-06-26  7:35       ` [PATCH 5/8] staging: kpc2000: add spaces Fabian Krueger
2019-06-26  7:35       ` [PATCH 6/8] staging: kpc2000: introduce 'unsigned int' Fabian Krueger
2019-06-26  7:35       ` [PATCH 7/8] staging: kpc2000: introduce __func__ Fabian Krueger
2019-06-26  7:35       ` [PATCH 8/8] staging: kpc2000: remove needless 'break' Fabian Krueger
2019-06-26  7:50       ` [PATCH 0/8] staging: kpc2000: style refactoring Dan Carpenter
2019-06-25 11:27 ` [PATCH 2/8] staging: kpc2000: blank lines after declaration Fabian Krueger
2019-06-25 11:27 ` [PATCH 3/8] staging: kpc2000: introduce usage of __packed Fabian Krueger
2019-06-25 11:27 ` [PATCH 4/8] staging: kpc2000: add spaces Fabian Krueger
2019-06-25 11:54   ` Dan Carpenter
2019-06-25 11:27 ` [PATCH 5/8] staging: kpc2000: remove unnecessary brackets Fabian Krueger
2019-06-25 11:27 ` [PATCH 6/8] staging: kpc2000: introduce 'unsigned int' Fabian Krueger
2019-06-25 11:55   ` Dan Carpenter
2019-06-25 11:27 ` [PATCH 7/8] staging: kpc2000: introduce __func__ Fabian Krueger
2019-06-25 11:27 ` [PATCH 8/8] staging: kpc2000: remove needless 'break' Fabian Krueger

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=20190626073531.8946-5-fabian.krueger@fau.de \
    --to=fabian.krueger@fau.de \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@i4.cs.fau.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael.scheiderer@fau.de \
    /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®