spi/rockchip: cleanup some coding issues and uncessary output

Suggested-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Addy Ke <addy.ke@rockchip.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

1 files changed, 23 insertions, 18 deletions

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 72fb287556d5..8c247086e520 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd
- * Author: addy ke <addy.ke@rock-chips.com>
+ * Author: Addy Ke <addy.ke@rock-chips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -186,7 +186,7 @@ struct rockchip_spi {
         void *rx_end;
 
         u32 state;
-
+        /* protect state */
         spinlock_t lock;
 
         struct completion xfer_completion;
@@ -278,7 +278,7 @@ static void rockchip_spi_set_cs(struct spi_device *spi, bool enable)
 }
 
 static int rockchip_spi_prepare_message(struct spi_master *master,
-                struct spi_message *msg)
+                                        struct spi_message *msg)
 {
         struct rockchip_spi *rs = spi_master_get_devdata(master);
         struct spi_device *spi = msg->spi;
@@ -294,13 +294,19 @@ static int rockchip_spi_prepare_message(struct spi_master *master,
 }
 
 static int rockchip_spi_unprepare_message(struct spi_master *master,
-                struct spi_message *msg)
+                                          struct spi_message *msg)
 {
         unsigned long flags;
         struct rockchip_spi *rs = spi_master_get_devdata(master);
 
         spin_lock_irqsave(&rs->lock, flags);
 
+        /*
+         * For DMA mode, we need terminate DMA channel and flush
+         * fifo for the next transfer if DMA thansfer timeout.
+         * unprepare_message() was called by core if transfer complete
+         * or timeout. Maybe it is reasonable for error handling here.
+         */
         if (rs->use_dma) {
                 if (rs->state & RXBUSY) {
                         dmaengine_terminate_all(rs->dma_rx.ch);
@@ -344,7 +350,7 @@ static void rockchip_spi_pio_reader(struct rockchip_spi *rs)
                 else
                         *(u16 *)(rs->rx) = (u16)rxw;
                 rs->rx += rs->n_bytes;
-        };
+        }
 }
 
 static int rockchip_spi_pio_transfer(struct rockchip_spi *rs)
@@ -414,7 +420,8 @@ static int rockchip_spi_dma_transfer(struct rockchip_spi *rs)
                 rxconf.src_maxburst = rs->n_bytes;
                 dmaengine_slave_config(rs->dma_rx.ch, &rxconf);
 
-                rxdesc = dmaengine_prep_slave_sg(rs->dma_rx.ch,
+                rxdesc = dmaengine_prep_slave_sg(
+                                rs->dma_rx.ch,
                                 rs->rx_sg.sgl, rs->rx_sg.nents,
                                 rs->dma_rx.direction, DMA_PREP_INTERRUPT);
 
@@ -429,7 +436,8 @@ static int rockchip_spi_dma_transfer(struct rockchip_spi *rs)
                 txconf.dst_maxburst = rs->n_bytes;
                 dmaengine_slave_config(rs->dma_tx.ch, &txconf);
 
-                txdesc = dmaengine_prep_slave_sg(rs->dma_tx.ch,
+                txdesc = dmaengine_prep_slave_sg(
+                                rs->dma_tx.ch,
                                 rs->tx_sg.sgl, rs->tx_sg.nents,
                                 rs->dma_tx.direction, DMA_PREP_INTERRUPT);
 
@@ -495,13 +503,13 @@ static void rockchip_spi_config(struct rockchip_spi *rs)
 
         spi_set_clk(rs, div);
 
-        dev_dbg(rs->dev, "cr0 0x%x, div %d\n",
-                        cr0, div);
+        dev_dbg(rs->dev, "cr0 0x%x, div %d\n", cr0, div);
 
         spi_enable_chip(rs, 1);
 }
 
-static int rockchip_spi_transfer_one(struct spi_master *master,
+static int rockchip_spi_transfer_one(
+                struct spi_master *master,
                 struct spi_device *spi,
                 struct spi_transfer *xfer)
 {
@@ -556,8 +564,8 @@ static int rockchip_spi_transfer_one(struct spi_master *master,
 }
 
 static bool rockchip_spi_can_dma(struct spi_master *master,
-                struct spi_device *spi,
-                struct spi_transfer *xfer)
+                                 struct spi_device *spi,
+                                 struct spi_transfer *xfer)
 {
         struct rockchip_spi *rs = spi_master_get_devdata(master);
 
@@ -572,10 +580,9 @@ static int rockchip_spi_probe(struct platform_device *pdev)
         struct resource *mem;
 
         master = spi_alloc_master(&pdev->dev, sizeof(struct rockchip_spi));
-        if (!master) {
-                dev_err(&pdev->dev, "No memory for spi_master\n");
+        if (!master)
                 return -ENOMEM;
-        }
+
         platform_set_drvdata(pdev, master);
 
         rs = spi_master_get_devdata(master);
@@ -676,8 +683,6 @@ static int rockchip_spi_probe(struct platform_device *pdev)
                 goto err_register_master;
         }
 
-        dev_info(&pdev->dev, "Rockchip SPI controller initialized\n");
-
         return 0;
 
 err_register_master:
@@ -817,6 +822,6 @@ static struct platform_driver rockchip_spi_driver = {
 
 module_platform_driver(rockchip_spi_driver);
 
-MODULE_AUTHOR("addy ke <addy.ke@rock-chips.com>");
+MODULE_AUTHOR("Addy Ke <addy.ke@rock-chips.com>");
 MODULE_DESCRIPTION("ROCKCHIP SPI Controller Driver");
 MODULE_LICENSE("GPL v2");