Merge tag 'spi-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi fixes from Mark Brown:
 "A few driver and documentation fixes, plus a fix for double error
  handling which had crept in due to the confusing documentation - it
  wasn't clear if the core or the driver was responsible for cleanup in
  error cases so both tried to do it with unfortunate results"

* tag 'spi-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: nuc900: Set SPI_LSB_FIRST for master->mode_bits if hw->pdata->lsb is true
  spi: rspi: Document support for Renesas QSPI in Kconfig
  spi: Fix crash with double message finalisation on error handling
  spi: correct the transfer_one_message documentation wording
  spi: document the transfer_one spi_master callback
  spi: spi.h: clarify the documentation of transfer_one

1 files changed, 16 insertions, 1 deletions

diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary
index f72e0d1e0da8..7982bcc4d151 100644
--- a/Documentation/spi/spi-summary
+++ b/Documentation/spi/spi-summary
@@ -543,7 +543,22 @@ SPI MASTER METHODS
         queuing transfers that arrive in the meantime. When the driver is
         finished with this message, it must call
         spi_finalize_current_message() so the subsystem can issue the next
-        transfer. This may sleep.
+        message. This may sleep.
+
+    master->transfer_one(struct spi_master *master, struct spi_device *spi,
+                         struct spi_transfer *transfer)
+        The subsystem calls the driver to transfer a single transfer while
+        queuing transfers that arrive in the meantime. When the driver is
+        finished with this transfer, it must call
+        spi_finalize_current_transfer() so the subsystem can issue the next
+        transfer. This may sleep. Note: transfer_one and transfer_one_message
+        are mutually exclusive; when both are set, the generic subsystem does
+        not call your transfer_one callback.
+
+        Return values:
+        negative errno: error
+        0: transfer is finished
+        1: transfer is still in progress
 
     DEPRECATED METHODS