[PATCH 0/1 v2] spi: Re-do the returning value of rspi_dma_check_then_transfer

[PATCH 0/1 v2] spi: Re-do the returning value of rspi_dma_check_then_transfer

[Cao Minh Hiep]

From: Hiep Cao Minh <cm-hiep@jinso.co.jp>

Hi Mark
Hi Geert

This is version 2 of spi-Re-do-the-returning-value-of-rspi_dma_check_then_transfer patch.
I have tested it at linux Upstream Linux-4.0.0-10713-g6e24fd1 on Lager and Koelsch.
To reduce indentation and complexity of code, drop "ret" then function 
rspi_dma_check_then_transfer should be returning rspi_dma_transfer directly
after checking error.
Please consider the following patch for the Rcar-Gen2.

Hiep Cao Minh (1):
  spi: Re-do the returning value of rspi_dma_check_then_transfer

 drivers/spi/spi-rspi.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

-- 
1.9.1

[PATCH 1/1 v2] spi: Re-do the returning value of rspi_dma_check_then_transfer

[Cao Minh Hiep]

From: Hiep Cao Minh <cm-hiep@jinso.co.jp>

To reduce indentation and complexity of code, insteeds of returning zero
the function rspi_dma_check_then_transfer should return rspi_dma_transfer
directly after checking error.

Signed-off-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
---
 drivers/spi/spi-rspi.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 186924a..0061e28 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -665,15 +665,12 @@ static bool rspi_can_dma(struct spi_master *master, struct spi_device *spi,
 static int rspi_dma_check_then_transfer(struct rspi_data *rspi,
 					 struct spi_transfer *xfer)
 {
-	if (rspi->master->can_dma && __rspi_can_dma(rspi, xfer)) {
-		/* rx_buf can be NULL on RSPI on SH in TX-only Mode */
-		int ret = rspi_dma_transfer(rspi, &xfer->tx_sg,
-					xfer->rx_buf ? &xfer->rx_sg : NULL);
-		if (ret != -EAGAIN)
-			return 0;
-	}
+	if (!rspi->master->can_dma || !__rspi_can_dma(rspi, xfer))
+		return -EAGAIN;
 
-	return -EAGAIN;
+	/* rx_buf can be NULL on RSPI on SH in TX-only Mode */
+	return rspi_dma_transfer(rspi, &xfer->tx_sg,
+				xfer->rx_buf ? &xfer->rx_sg : NULL);
 }
 
 static int rspi_common_transfer(struct rspi_data *rspi,
-- 
1.9.1

Re: [PATCH 1/1 v2] spi: Re-do the returning value of rspi_dma_check_then_transfer

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 533 bytes --]

On Thu, Apr 30, 2015 at 11:12:12AM +0900, Cao Minh Hiep wrote:
> From: Hiep Cao Minh <cm-hiep@jinso.co.jp>
> 
> To reduce indentation and complexity of code, insteeds of returning zero
> the function rspi_dma_check_then_transfer should return rspi_dma_transfer
> directly after checking error.

Applied, thanks.  Please use subject lines reflecting the style for the
subsystem and don't send cover letters for single patches - if there's
any content in there it's usually a sign that the changelog is not
detailed enough.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH 1/1 v2] spi: Re-do the returning value of rspi_dma_check_then_transfer

[Cao Minh Hiep]

Hi Mark-san

On 2015年05月07日 21:57, Mark Brown wrote:
> On Thu, Apr 30, 2015 at 11:12:12AM +0900, Cao Minh Hiep wrote:
>> From: Hiep Cao Minh <cm-hiep@jinso.co.jp>
>>
>> To reduce indentation and complexity of code, insteeds of returning zero
>> the function rspi_dma_check_then_transfer should return rspi_dma_transfer
>> directly after checking error.
> Applied, thanks.  Please use subject lines reflecting the style for the
> subsystem and don't send cover letters for single patches - if there's
> any content in there it's usually a sign that the changelog is not
> detailed enough.
Thank you!, I understood.

Hiep.