On 07.11.2018 11:27, Ben Dooks wrote:

On 2018-11-06 13:14, Dmitry Osipenko wrote:

quoted

On 31.10.2018 19:03, Ben Dooks wrote:

quoted

The use of Dma is annoying, since it is an acronym so should be all
upper case. Fix this throughout the driver.

Signed-off-by: Ben Dooks <redacted>
---
 drivers/dma/tegra20-apb-dma.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index adfd918baedc..4f7d1e576d03 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c

@@ -146,7 +146,7 @@ struct tegra_dma_channel_regs {

 };

 /*
- * tegra_dma_sg_req: Dma request details to configure hardware. This
+ * tegra_dma_sg_req: DMA request details to configure hardware. This
  * contains the details for one transfer to configure DMA hw.
  * The client's request for data transfer can be broken into multiple
  * sub-transfer as per requester details and hw support.

@@ -574,7 +574,7 @@ static bool handle_continuous_head_request(struct tegra_dma_channel *tdc,

     struct tegra_dma_sg_req *hsgreq = NULL;

     if (list_empty(&tdc->pending_sg_req)) {
-        dev_err(tdc2dev(tdc), "Dma is running without req\n");
+        dev_err(tdc2dev(tdc), "DMA is running without req\n");
         tegra_dma_stop(tdc);
         return false;
     }

@@ -922,7 +922,7 @@ static int get_transfer_param(struct tegra_dma_channel *tdc,

         return 0;

     default:
-        dev_err(tdc2dev(tdc), "Dma direction is not supported\n");
+        dev_err(tdc2dev(tdc), "DMA direction is not supported\n");
         return -EINVAL;
     }
     return -EINVAL;

@@ -988,7 +988,7 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_slave_sg(

     dma_desc = tegra_dma_desc_get(tdc);
     if (!dma_desc) {
-        dev_err(tdc2dev(tdc), "Dma descriptors not available\n");
+        dev_err(tdc2dev(tdc), "DMA descriptors not available\n");
         return NULL;
     }
     INIT_LIST_HEAD(&dma_desc->tx_list);

@@ -1008,14 +1008,14 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_slave_sg(

         if ((len & 3) || (mem & 3) ||
                 (len > tdc->tdma->chip_data->max_dma_count)) {
             dev_err(tdc2dev(tdc),
-                "Dma length/memory address is not supported\n");
+                "DMA length/memory address is not supported\n");
             tegra_dma_desc_put(tdc, dma_desc);
             return NULL;
         }

         sg_req = tegra_dma_sg_req_get(tdc);
         if (!sg_req) {
-            dev_err(tdc2dev(tdc), "Dma sg-req not available\n");
+            dev_err(tdc2dev(tdc), "DMA sg-req not available\n");
             tegra_dma_desc_put(tdc, dma_desc);
             return NULL;
         }

@@ -1147,7 +1147,7 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_dma_cyclic(

     while (remain_len) {
         sg_req = tegra_dma_sg_req_get(tdc);
         if (!sg_req) {
-            dev_err(tdc2dev(tdc), "Dma sg-req not available\n");
+            dev_err(tdc2dev(tdc), "DMA sg-req not available\n");
             tegra_dma_desc_put(tdc, dma_desc);
             return NULL;
         }

There is also:

    if (!tdc->config_init) {
        dev_err(tdc2dev(tdc), "dma channel is not configured\n");
        return NULL;
    }

that could be fixed too and with that:

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>

Thanks, fixed for next patch series.

	if (!hsgreq->configured) {
		tegra_dma_stop(tdc);
		dev_err(tdc2dev(tdc), "Error in dma transfer, aborting dma\n");
		tegra_dma_abort_all(tdc);
		return false;
	}

Please change that one too for consistency. The rest looks okay.