[PATCH 14/24] ste_dma40: One check less in d40_prep_sg() after error detection

[SF Markus Elfring]

From: Markus Elfring 
Date: Sat, 17 Sep 2016 15:34:07 +0200

* Adjust jump targets according to the Linux coding style convention.

* Delete a repeated check which became unnecessary with this refactoring.

Signed-off-by: Markus Elfring 
---
 drivers/dma/ste_dma40.c | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 0788add..a7e7cd0 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2251,7 +2251,7 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist 
*sg_src,
 
desc = d40_prep_desc(chan, sg_src, sg_len, dma_flags);
if (desc == NULL)
-   goto err;
+   goto unlock;
 
if (sg_next(_src[sg_len - 1]) == sg_src)
desc->cyclic = true;
@@ -2271,7 +2271,7 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist 
*sg_src,
if (ret) {
chan_err(chan, "Failed to prepare %s sg job: %d\n",
 chan_is_logical(chan) ? "log" : "phy", ret);
-   goto err;
+   goto free_desc;
}
 
/*
@@ -2283,10 +2283,9 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist 
*sg_src,
spin_unlock_irqrestore(>lock, flags);
 
return >txd;
-
-err:
-   if (desc)
-   d40_desc_free(chan, desc);
+ free_desc:
+   d40_desc_free(chan, desc);
+ unlock:
spin_unlock_irqrestore(>lock, flags);
return NULL;
 }
-- 
2.10.0

[PATCH 14/24] ste_dma40: One check less in d40_prep_sg() after error detection

[SF Markus Elfring]

From: Markus Elfring 
Date: Sat, 17 Sep 2016 15:34:07 +0200

* Adjust jump targets according to the Linux coding style convention.

* Delete a repeated check which became unnecessary with this refactoring.

Signed-off-by: Markus Elfring 
---
 drivers/dma/ste_dma40.c | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 0788add..a7e7cd0 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2251,7 +2251,7 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist 
*sg_src,
 
desc = d40_prep_desc(chan, sg_src, sg_len, dma_flags);
if (desc == NULL)
-   goto err;
+   goto unlock;
 
if (sg_next(_src[sg_len - 1]) == sg_src)
desc->cyclic = true;
@@ -2271,7 +2271,7 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist 
*sg_src,
if (ret) {
chan_err(chan, "Failed to prepare %s sg job: %d\n",
 chan_is_logical(chan) ? "log" : "phy", ret);
-   goto err;
+   goto free_desc;
}
 
/*
@@ -2283,10 +2283,9 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist 
*sg_src,
spin_unlock_irqrestore(>lock, flags);
 
return >txd;
-
-err:
-   if (desc)
-   d40_desc_free(chan, desc);
+ free_desc:
+   d40_desc_free(chan, desc);
+ unlock:
spin_unlock_irqrestore(>lock, flags);
return NULL;
 }
-- 
2.10.0