diff options
| -rw-r--r-- | drivers/dma/dmaengine.c | 14 | ||||
| -rw-r--r-- | include/linux/dmaengine.h | 1 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index f15712f2fec6..344b0ac6d985 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
| @@ -355,20 +355,6 @@ struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type) | |||
| 355 | } | 355 | } |
| 356 | EXPORT_SYMBOL(dma_find_channel); | 356 | EXPORT_SYMBOL(dma_find_channel); |
| 357 | 357 | ||
| 358 | /* | ||
| 359 | * net_dma_find_channel - find a channel for net_dma | ||
| 360 | * net_dma has alignment requirements | ||
| 361 | */ | ||
| 362 | struct dma_chan *net_dma_find_channel(void) | ||
| 363 | { | ||
| 364 | struct dma_chan *chan = dma_find_channel(DMA_MEMCPY); | ||
| 365 | if (chan && !is_dma_copy_aligned(chan->device, 1, 1, 1)) | ||
| 366 | return NULL; | ||
| 367 | |||
| 368 | return chan; | ||
| 369 | } | ||
| 370 | EXPORT_SYMBOL(net_dma_find_channel); | ||
| 371 | |||
| 372 | /** | 358 | /** |
| 373 | * dma_issue_pending_all - flush all pending operations across all channels | 359 | * dma_issue_pending_all - flush all pending operations across all channels |
| 374 | */ | 360 | */ |
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index f5cc5d4f1ad5..2bff9abc162a 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
| @@ -1090,7 +1090,6 @@ void dma_async_device_unregister(struct dma_device *device); | |||
| 1090 | void dma_run_dependencies(struct dma_async_tx_descriptor *tx); | 1090 | void dma_run_dependencies(struct dma_async_tx_descriptor *tx); |
| 1091 | struct dma_chan *dma_get_slave_channel(struct dma_chan *chan); | 1091 | struct dma_chan *dma_get_slave_channel(struct dma_chan *chan); |
| 1092 | struct dma_chan *dma_get_any_slave_channel(struct dma_device *device); | 1092 | struct dma_chan *dma_get_any_slave_channel(struct dma_device *device); |
| 1093 | struct dma_chan *net_dma_find_channel(void); | ||
| 1094 | #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y) | 1093 | #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y) |
| 1095 | #define dma_request_slave_channel_compat(mask, x, y, dev, name) \ | 1094 | #define dma_request_slave_channel_compat(mask, x, y, dev, name) \ |
| 1096 | __dma_request_slave_channel_compat(&(mask), x, y, dev, name) | 1095 | __dma_request_slave_channel_compat(&(mask), x, y, dev, name) |
