From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Mark Brown <broonie@kernel.org>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
Magnus Damm <magnus.damm@gmail.com>,
linux-spi@vger.kernel.org, linux-sh@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH 06/18] spi: rspi: Don't consider DMA configuration failures fatal
Date: Mon, 2 Jun 2014 15:38:08 +0200 [thread overview]
Message-ID: <1401716301-29612-7-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1401716301-29612-1-git-send-email-geert+renesas@glider.be>
Fall back to PIO if DMA configuration failed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/spi/spi-rspi.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index fdbd46d0c570..94a99ec7d989 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -1190,10 +1190,8 @@ static int rspi_probe(struct platform_device *pdev)
}
ret = rspi_request_dma(rspi, pdev);
- if (ret < 0) {
- dev_err(&pdev->dev, "rspi_request_dma failed.\n");
- goto error3;
- }
+ if (ret < 0)
+ dev_warn(&pdev->dev, "DMA not available, using PIO\n");
ret = devm_spi_register_master(&pdev->dev, master);
if (ret < 0) {
--
1.9.1
next prev parent reply other threads:[~2014-06-02 13:38 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-02 13:38 [PATCH 00/18] spi: rspi: Add DMA support for QSPI on R-Car Gen2 Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 01/18] spi: rspi: Extract rspi_wait_for_{tx_empty,rx_full}() Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 02/18] spi: rspi: Do not call rspi_receive_init() for TX-only Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 03/18] [RFC] spi: rspi: Remove unused 16-bit DMA support Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 05/18] spi: rspi: Extract rspi_pio_transfer() Geert Uytterhoeven
2014-06-02 13:38 ` Geert Uytterhoeven [this message]
2014-06-02 13:38 ` [PATCH 09/18] spi: rspi: SPI DMA core needs both RX and TX DMA to function Geert Uytterhoeven
[not found] ` <1401716301-29612-10-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
2014-06-02 14:42 ` Mark Brown
2014-06-02 14:55 ` Geert Uytterhoeven
[not found] ` <CAMuHMdXra=NjAy6WuQBf1Rm3iHv8J2qYubTpq3scxGq8+wK_tg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-06-02 16:28 ` Mark Brown
2014-06-02 13:38 ` [PATCH 12/18] spi: rspi: Pass sg_tables instead of spi_tranfer to rspi_*_dma() Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 13/18] spi: rspi: Merge rspi_*_dma() into rspi_dma_transfer() Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 14/18] spi: rspi: Absorb rspi_rz_transfer_out_in() into rspi_rz_transfer_one() Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 15/18] spi: rspi: Add DMA support for QSPI on R-Car Gen2 Geert Uytterhoeven
[not found] ` <1401716301-29612-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
2014-06-02 13:38 ` [PATCH 04/18] spi: rspi: Use core SPI_MASTER_MUST_[RT]X handling Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 07/18] spi: rspi: Extract rspi_request_dma_chan() Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 08/18] spi: rspi: Remove unneeded resource test in DMA setup Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 10/18] spi: rspi: Use SPI core DMA mapping framework Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 11/18] spi: rspi: Move RSPI-specific setup out of DMA routines Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 16/18] spi: rspi: Add DMA support for RSPI on RZ/A1H Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 18/18] [RFC] spi: rspi: Add DT support to DMA setup Geert Uytterhoeven
2014-06-02 14:54 ` Mark Brown
[not found] ` <20140602145447.GJ31751-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-06-02 14:57 ` Geert Uytterhoeven
2014-06-02 13:38 ` [PATCH 17/18] spi: rspi: Extract rspi_common_transfer() Geert Uytterhoeven
2014-06-05 5:58 ` [PATCH 00/18] spi: rspi: Add DMA support for QSPI on R-Car Gen2 Yoshihiro Shimoda
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=1401716301-29612-7-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=broonie@kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=yoshihiro.shimoda.uh@renesas.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).