Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dma updates from Vinod Koul:
 "Some notable changes are:
   - new driver for AMBA AXI NBPF by Guennadi
   - new driver for sun6i controller by Maxime
   - pl330 drivers fixes from Lar's
   - sh-dma updates and fixes from Laurent, Geert and Kuninori
   - Documentation updates from Geert
   - drivers fixes and updates spread over dw, edma, freescale, mpc512x
     etc.."

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (72 commits)
  dmaengine: sun6i: depends on RESET_CONTROLLER
  dma: at_hdmac: fix invalid remaining bytes detection
  dmaengine: nbpfaxi: don't build this driver where it cannot be used
  dmaengine: nbpf_error_get_channel() can be static
  dma: pl08x: Use correct specifier for size_t values
  dmaengine: Remove the context argument to the prep_dma_cyclic operation
  dmaengine: nbpfaxi: convert to tasklet
  dmaengine: nbpfaxi: fix a theoretical race
  dmaengine: add a driver for AMBA AXI NBPF DMAC IP cores
  dmaengine: add device tree binding documentation for the nbpfaxi driver
  dmaengine: edma: Do not register second device when booted with DT
  dmaengine: edma: Do not change the error code returned from edma_alloc_slot
  dmaengine: rcar-dmac: Add device tree bindings documentation
  dmaengine: shdma: Allocate cyclic sg list dynamically
  dmaengine: shdma: Make channel filter ignore unrelated devices
  dmaengine: sh: Rework Kconfig and Makefile
  dmaengine: sun6i: Fix memory leaks
  dmaengine: sun6i: Free the interrupt before killing the tasklet
  dmaengine: sun6i: Remove switch statement from buswidth convertion routine
  dmaengine: of: kconfig: select DMA_ENGINE when DMA_OF is selected
  ...

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c
index b396a7fb53ab..3c5711d5fe97 100644
--- a/drivers/dma/fsl-edma.c
+++ b/drivers/dma/fsl-edma.c
@@ -248,11 +248,12 @@ static void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
                         unsigned int slot, bool enable)
 {
         u32 ch = fsl_chan->vchan.chan.chan_id;
-        void __iomem *muxaddr = fsl_chan->edma->muxbase[ch / DMAMUX_NR];
+        void __iomem *muxaddr;
         unsigned chans_per_mux, ch_off;
 
         chans_per_mux = fsl_chan->edma->n_chans / DMAMUX_NR;
         ch_off = fsl_chan->vchan.chan.chan_id % chans_per_mux;
+        muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux];
 
         if (enable)
                 edma_writeb(fsl_chan->edma,
@@ -516,7 +517,7 @@ err:
 static struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic(
                 struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
                 size_t period_len, enum dma_transfer_direction direction,
-                unsigned long flags, void *context)
+                unsigned long flags)
 {
         struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
         struct fsl_edma_desc *fsl_desc;
@@ -724,6 +725,7 @@ static struct dma_chan *fsl_edma_xlate(struct of_phandle_args *dma_spec,
 {
         struct fsl_edma_engine *fsl_edma = ofdma->of_dma_data;
         struct dma_chan *chan, *_chan;
+        unsigned long chans_per_mux = fsl_edma->n_chans / DMAMUX_NR;
 
         if (dma_spec->args_count != 2)
                 return NULL;
@@ -732,7 +734,7 @@ static struct dma_chan *fsl_edma_xlate(struct of_phandle_args *dma_spec,
         list_for_each_entry_safe(chan, _chan, &fsl_edma->dma_dev.channels, device_node) {
                 if (chan->client_count)
                         continue;
-                if ((chan->chan_id / DMAMUX_NR) == dma_spec->args[0]) {
+                if ((chan->chan_id / chans_per_mux) == dma_spec->args[0]) {
                         chan = dma_get_slave_channel(chan);
                         if (chan) {
                                 chan->device->privatecnt++;