aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2015-01-19 06:54:27 -0500
committerVinod Koul <vinod.koul@intel.com>2015-01-19 08:02:51 -0500
commitfdb8df9933632e177621daf60da74fc693a8c7d1 (patch)
tree68aed46c45fe2dab629c6c54eb6649db0f1ae56a
parent4d76bbed2d8d9f7bf8bca31e64ef977e015a86fa (diff)
dmaengine: Add dma_get_slave_caps() inline stub when !CONFIG_DMA_ENGINE
Commit 0d5484b1c3db8a38 ("dmaengine: Move dma_get_slave_caps() implementation to dmaengine.c") turned the inline dma_get_slave_caps() function into an external function without adding an inline stub for the cases where CONFIG_DMA_ENGINE isn't set. This breaks compilation of drivers using the DMA engine API when CONFIG_DMA_ENGINE isn't set. Add an inline stub to fix compilation. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Fixes: 0d5484b1c3db ("dmaengine: Move dma_get_slave_caps() implementation to dmaengine.c") Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--include/linux/dmaengine.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 1b4842bb3890..50745e3a8a3f 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -758,8 +758,6 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_sg(
758 src_sg, src_nents, flags); 758 src_sg, src_nents, flags);
759} 759}
760 760
761int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps);
762
763static inline int dmaengine_terminate_all(struct dma_chan *chan) 761static inline int dmaengine_terminate_all(struct dma_chan *chan)
764{ 762{
765 if (chan->device->device_terminate_all) 763 if (chan->device->device_terminate_all)
@@ -1048,6 +1046,7 @@ struct dma_chan *dma_request_slave_channel_reason(struct device *dev,
1048 const char *name); 1046 const char *name);
1049struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name); 1047struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name);
1050void dma_release_channel(struct dma_chan *chan); 1048void dma_release_channel(struct dma_chan *chan);
1049int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps);
1051#else 1050#else
1052static inline struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type) 1051static inline struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type)
1053{ 1052{
@@ -1082,6 +1081,11 @@ static inline struct dma_chan *dma_request_slave_channel(struct device *dev,
1082static inline void dma_release_channel(struct dma_chan *chan) 1081static inline void dma_release_channel(struct dma_chan *chan)
1083{ 1082{
1084} 1083}
1084static inline int dma_get_slave_caps(struct dma_chan *chan,
1085 struct dma_slave_caps *caps)
1086{
1087 return -ENXIO;
1088}
1085#endif 1089#endif
1086 1090
1087/* --- DMA device --- */ 1091/* --- DMA device --- */