Merge remote-tracking branch 'slave-dma/next'

diff --cc drivers/dma/imx-dma.c
Simple merge

diff --cc drivers/dma/imx-sdma.c
index 86708fb,af14a8d..12e03a9
--- 1/drivers/dma/imx-sdma.c
--- 2/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@@ -1182,8 -1189,8 +1189,8 @@@ static int sdma_request_channel0(struc
  {
        int ret = -EBUSY;
  
-       sdma->bd0 = dma_alloc_coherent(NULL, PAGE_SIZE, &sdma->bd0_phys,
 -      sdma->bd0 = dma_zalloc_coherent(sdma->dev, PAGE_SIZE, &sdma->bd0_phys,
 -                                      GFP_NOWAIT);
++      sdma->bd0 = dma_alloc_coherent(sdma->dev, PAGE_SIZE, &sdma->bd0_phys,
 +                                     GFP_NOWAIT);
        if (!sdma->bd0) {
                ret = -ENOMEM;
                goto out;
@@@ -1205,8 -1212,8 +1212,8 @@@ static int sdma_alloc_bd(struct sdma_de
        u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor);
        int ret = 0;
  
-       desc->bd = dma_alloc_coherent(NULL, bd_size, &desc->bd_phys,
-                                     GFP_NOWAIT);
 -      desc->bd = dma_zalloc_coherent(desc->sdmac->sdma->dev, bd_size,
 -                                     &desc->bd_phys, GFP_NOWAIT);
++      desc->bd = dma_alloc_coherent(desc->sdmac->sdma->dev, bd_size,
++                                    &desc->bd_phys, GFP_NOWAIT);
        if (!desc->bd) {
                ret = -ENOMEM;
                goto out;

diff --cc drivers/dma/xilinx/xilinx_dma.c
Simple merge