[PATCH 5/8] staging: kpc2000: remove unnecessary brackets

[Fabian Krueger]

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

Signed-off-by: Fabian Krueger <fabian.krue...@fau.de>
Signed-off-by: Michael Scheiderer <michael.scheide...@fau.de>
---
 drivers/staging/kpc2000/kpc2000_spi.c | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/kpc2000/kpc2000_spi.c 
b/drivers/staging/kpc2000/kpc2000_spi.c
index 8f56886f4673..79d7c44315e8 100644
--- a/drivers/staging/kpc2000/kpc2000_spi.c
+++ b/drivers/staging/kpc2000/kpc2000_spi.c
@@ -218,11 +218,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();
        }
@@ -331,9 +330,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) {
@@ -391,17 +389,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 */
@@ -420,9 +415,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 */
@@ -445,9 +439,7 @@ kp_spi_cleanup(struct spi_device *spidev)
 {
        struct kp_spi_controller_state *cs = spidev->controller_state;
 
-       if (cs) {
-               kfree(cs);
-       }
+       kfree(cs);
 }
 
 /******************
@@ -489,9 +481,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

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel