diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2015-10-14 14:42:47 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-10-14 19:57:11 +0530 |
| commit | dc9b60552f6a6a56b1defb88aa9f7f1498fcc045 (patch) | |
| tree | 9fc445b22bce2f9517ad8998d992f63da26bee42 /arch/arm/common | |
| parent | d4cb7f404247173e2c760a01bf06fd1016a8b0d4 (diff) | |
| download | op-kernel-dev-dc9b60552f6a6a56b1defb88aa9f7f1498fcc045.zip op-kernel-dev-dc9b60552f6a6a56b1defb88aa9f7f1498fcc045.tar.gz | |
ARM/dmaengine: edma: Move of_dma_controller_register to the dmaengine driver
If the of_dma_controller is registered in the non dmaengine driver we could
have race condition:
the of_dma_controller has been registered, but the dmaengine driver is not
yet probed. Drivers requesting DMA channels during this window will fail
since we do not yet have dmaengine drivers registered.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/edma.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c index 7c2fe52..d82fced 100644 --- a/arch/arm/common/edma.c +++ b/arch/arm/common/edma.c @@ -29,7 +29,6 @@ #include <linux/dma-mapping.h> #include <linux/of_address.h> #include <linux/of_device.h> -#include <linux/of_dma.h> #include <linux/of_irq.h> #include <linux/pm_runtime.h> @@ -1191,10 +1190,6 @@ static int edma_of_parse_dt(struct device *dev, return ret; } -static struct of_dma_filter_info edma_filter_info = { - .filter_fn = edma_filter_fn, -}; - static struct edma_soc_info *edma_setup_info_from_dt(struct device *dev, struct device_node *node) { @@ -1209,11 +1204,6 @@ static struct edma_soc_info *edma_setup_info_from_dt(struct device *dev, if (ret) return ERR_PTR(ret); - dma_cap_set(DMA_SLAVE, edma_filter_info.dma_cap); - dma_cap_set(DMA_CYCLIC, edma_filter_info.dma_cap); - of_dma_controller_register(dev->of_node, of_dma_simple_xlate, - &edma_filter_info); - return info; } #else |
