aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Bounine <alexandre.bounine@idt.com>2016-08-02 17:06:34 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-02 19:35:33 -0400
commitf8e3a68c05f0f09a0da947b9d447268d2d3f8780 (patch)
treefe4c3503fea1a5bf0eb95d7c25adddab29de3b17
parentcca446d4ce883ae28ff589dd1c9aef8d5148c7f7 (diff)
rapidio: fix return value description for dma_prep functions
Update return value description for rio_dma_prep_... functions to include error-valued pointer that can be returned by HW mport device drivers. Return values from these functions must be checked using IS_ERR_OR_NULL macro. This patch is applicable to kernel versions starting from v4.6-rc1. Link: http://lkml.kernel.org/r/1469125134-16523-4-git-send-email-alexandre.bounine@idt.com Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> Cc: Matt Porter <mporter@kernel.crashing.org> Cc: Andre van Herk <andre.van.herk@prodrive-technologies.com> Cc: Barry Wood <barry.wood@idt.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rapidio/rio.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 0dcaa660cba1..840802943dc0 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -1848,7 +1848,9 @@ EXPORT_SYMBOL_GPL(rio_release_dma);
1848 * Initializes RapidIO capable DMA channel for the specified data transfer. 1848 * Initializes RapidIO capable DMA channel for the specified data transfer.
1849 * Uses DMA channel private extension to pass information related to remote 1849 * Uses DMA channel private extension to pass information related to remote
1850 * target RIO device. 1850 * target RIO device.
1851 * Returns pointer to DMA transaction descriptor or NULL if failed. 1851 *
1852 * Returns: pointer to DMA transaction descriptor if successful,
1853 * error-valued pointer or NULL if failed.
1852 */ 1854 */
1853struct dma_async_tx_descriptor *rio_dma_prep_xfer(struct dma_chan *dchan, 1855struct dma_async_tx_descriptor *rio_dma_prep_xfer(struct dma_chan *dchan,
1854 u16 destid, struct rio_dma_data *data, 1856 u16 destid, struct rio_dma_data *data,
@@ -1883,7 +1885,9 @@ EXPORT_SYMBOL_GPL(rio_dma_prep_xfer);
1883 * Initializes RapidIO capable DMA channel for the specified data transfer. 1885 * Initializes RapidIO capable DMA channel for the specified data transfer.
1884 * Uses DMA channel private extension to pass information related to remote 1886 * Uses DMA channel private extension to pass information related to remote
1885 * target RIO device. 1887 * target RIO device.
1886 * Returns pointer to DMA transaction descriptor or NULL if failed. 1888 *
1889 * Returns: pointer to DMA transaction descriptor if successful,
1890 * error-valued pointer or NULL if failed.
1887 */ 1891 */
1888struct dma_async_tx_descriptor *rio_dma_prep_slave_sg(struct rio_dev *rdev, 1892struct dma_async_tx_descriptor *rio_dma_prep_slave_sg(struct rio_dev *rdev,
1889 struct dma_chan *dchan, struct rio_dma_data *data, 1893 struct dma_chan *dchan, struct rio_dma_data *data,