aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/dmaengine.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/dmaengine.h')
-rw-r--r--include/linux/dmaengine.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 3934ebdd85c2..9d8688b92d8b 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -321,14 +321,14 @@ struct dma_async_tx_descriptor {
321 dma_cookie_t (*tx_submit)(struct dma_async_tx_descriptor *tx); 321 dma_cookie_t (*tx_submit)(struct dma_async_tx_descriptor *tx);
322 dma_async_tx_callback callback; 322 dma_async_tx_callback callback;
323 void *callback_param; 323 void *callback_param;
324#ifndef CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH 324#ifdef CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH
325 struct dma_async_tx_descriptor *next; 325 struct dma_async_tx_descriptor *next;
326 struct dma_async_tx_descriptor *parent; 326 struct dma_async_tx_descriptor *parent;
327 spinlock_t lock; 327 spinlock_t lock;
328#endif 328#endif
329}; 329};
330 330
331#ifdef CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH 331#ifndef CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH
332static inline void txd_lock(struct dma_async_tx_descriptor *txd) 332static inline void txd_lock(struct dma_async_tx_descriptor *txd)
333{ 333{
334} 334}
@@ -656,11 +656,11 @@ static inline void net_dmaengine_put(void)
656#ifdef CONFIG_ASYNC_TX_DMA 656#ifdef CONFIG_ASYNC_TX_DMA
657#define async_dmaengine_get() dmaengine_get() 657#define async_dmaengine_get() dmaengine_get()
658#define async_dmaengine_put() dmaengine_put() 658#define async_dmaengine_put() dmaengine_put()
659#ifdef CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH 659#ifndef CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH
660#define async_dma_find_channel(type) dma_find_channel(DMA_ASYNC_TX) 660#define async_dma_find_channel(type) dma_find_channel(DMA_ASYNC_TX)
661#else 661#else
662#define async_dma_find_channel(type) dma_find_channel(type) 662#define async_dma_find_channel(type) dma_find_channel(type)
663#endif /* CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH */ 663#endif /* CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH */
664#else 664#else
665static inline void async_dmaengine_get(void) 665static inline void async_dmaengine_get(void)
666{ 666{