linux-spi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Serge Semin <Sergey.Semin@baikalelectronics.ru>
To: Mark Brown <broonie@kernel.org>
Cc: Serge Semin <Sergey.Semin@baikalelectronics.ru>,
	Serge Semin <fancer.lancer@gmail.com>,
	Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>,
	Ramil Zaripov <Ramil.Zaripov@baikalelectronics.ru>,
	Pavel Parkhomenko <Pavel.Parkhomenko@baikalelectronics.ru>,
	Andy Shevchenko <andy.shevchenko@gmail.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Lars Povlsen <lars.povlsen@microchip.com>,
	"wuxu . wu" <wuxu.wu@huawei.com>, Feng Tang <feng.tang@intel.com>,
	Rob Herring <robh+dt@kernel.org>, <linux-spi@vger.kernel.org>,
	<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 12/21] spi: dw: Discard chip enabling on DMA setup error
Date: Wed, 30 Sep 2020 21:55:36 +0300	[thread overview]
Message-ID: <20200930185545.29959-13-Sergey.Semin@baikalelectronics.ru> (raw)
In-Reply-To: <20200930185545.29959-1-Sergey.Semin@baikalelectronics.ru>

It's pointless to enable the chip back if the DMA setup procedure fails,
since we'll disable it on the next transfer anyway. For the same reason We
don't do that in case of a failure detected in any other methods called
from the transfer_one() method.

While at it consider any non-zero value returned from the dma_setup
callback to be erroneous as it's supposed to be in the kernel.

Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
---
 drivers/spi/spi-dw-core.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c
index 58a7c7465c61..fca929280aab 100644
--- a/drivers/spi/spi-dw-core.c
+++ b/drivers/spi/spi-dw-core.c
@@ -372,10 +372,8 @@ static int dw_spi_transfer_one(struct spi_controller *master,
 
 	if (dws->dma_mapped) {
 		ret = dws->dma_ops->dma_setup(dws, transfer);
-		if (ret < 0) {
-			spi_enable_chip(dws, 1);
+		if (ret)
 			return ret;
-		}
 	}
 
 	spi_enable_chip(dws, 1);
-- 
2.27.0


  parent reply	other threads:[~2020-09-30 18:56 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-30 18:55 [PATCH v2 00/21] spi: dw: Add full Baikal-T1 SPI Controllers support Serge Semin
2020-09-30 18:55 ` [PATCH v2 01/21] spi: dw: Use an explicit set_cs assignment Serge Semin
2020-09-30 18:55 ` [PATCH v2 02/21] spi: dw: Add DWC SSI capability Serge Semin
2020-10-01 21:51   ` Mark Brown
2020-10-01 21:55     ` Serge Semin
2020-09-30 18:55 ` [PATCH v2 03/21] spi: dw: Detach SPI device specific CR0 config method Serge Semin
2020-09-30 18:55 ` [PATCH v2 04/21] spi: dw: Update SPI bus speed in a config function Serge Semin
2020-09-30 18:55 ` [PATCH v2 05/21] spi: dw: Simplify the SPI bus speed config procedure Serge Semin
2020-09-30 18:55 ` [PATCH v2 06/21] spi: dw: Update Rx sample delay in the config function Serge Semin
2020-09-30 18:55 ` [PATCH v2 07/21] spi: dw: Add DW SPI controller config structure Serge Semin
2020-09-30 18:55 ` [PATCH v2 08/21] spi: dw: Refactor data IO procedure Serge Semin
2020-09-30 18:55 ` [PATCH v2 09/21] spi: dw: Refactor IRQ-based SPI transfer procedure Serge Semin
2020-09-30 18:55 ` [PATCH v2 10/21] spi: dw: Perform IRQ setup in a dedicated function Serge Semin
2020-09-30 18:55 ` [PATCH v2 11/21] spi: dw: Unmask IRQs after enabling the chip Serge Semin
2020-09-30 18:55 ` Serge Semin [this message]
2020-09-30 18:55 ` [PATCH v2 13/21] spi: dw: De-assert chip-select on reset Serge Semin
2020-09-30 18:55 ` [PATCH v2 14/21] spi: dw: Explicitly de-assert CS on SPI transfer completion Serge Semin
2020-09-30 18:55 ` [PATCH v2 15/21] spi: dw: Move num-of retries parameter to the header file Serge Semin
2020-09-30 18:55 ` [PATCH v2 16/21] spi: dw: Add generic DW SSI status-check method Serge Semin
2020-09-30 18:55 ` [PATCH v2 17/21] spi: dw: Add memory operations support Serge Semin
2020-09-30 18:55 ` [PATCH v2 18/21] spi: dw: Introduce max mem-ops SPI bus frequency setting Serge Semin
2020-09-30 18:55 ` [PATCH v2 19/21] spi: dw: Add poll-based SPI transfers support Serge Semin
2020-09-30 18:55 ` [PATCH v2 20/21] dt-bindings: spi: dw: Add Baikal-T1 SPI Controllers Serge Semin
2020-09-30 18:55 ` [PATCH v2 21/21] spi: dw: Add Baikal-T1 SPI Controller glue driver Serge Semin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200930185545.29959-13-Sergey.Semin@baikalelectronics.ru \
    --to=sergey.semin@baikalelectronics.ru \
    --cc=Alexey.Malahov@baikalelectronics.ru \
    --cc=Pavel.Parkhomenko@baikalelectronics.ru \
    --cc=Ramil.Zaripov@baikalelectronics.ru \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=andy.shevchenko@gmail.com \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=fancer.lancer@gmail.com \
    --cc=feng.tang@intel.com \
    --cc=lars.povlsen@microchip.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=wuxu.wu@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).