Merge tag 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux...

[deliverable/linux.git] / drivers / dma / omap-dma.c

diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index c0016a68b44659d4965e69d73653c4860c1c49d2..167dbaf6574275a0fffd5590b7a169e811320b39 100644 (file)
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -948,8 +948,10 @@ static struct dma_async_tx_descriptor *omap_dma_prep_dma_cyclic(
        return vchan_tx_prep(&c->vc, &d->vd, flags);
 }
 
-static int omap_dma_slave_config(struct omap_chan *c, struct dma_slave_config *cfg)
+static int omap_dma_slave_config(struct dma_chan *chan, struct dma_slave_config *cfg)
 {
+       struct omap_chan *c = to_omap_dma_chan(chan);
+
        if (cfg->src_addr_width == DMA_SLAVE_BUSWIDTH_8_BYTES ||
            cfg->dst_addr_width == DMA_SLAVE_BUSWIDTH_8_BYTES)
                return -EINVAL;
@@ -959,8 +961,9 @@ static int omap_dma_slave_config(struct omap_chan *c, struct dma_slave_config *c
        return 0;
 }
 
-static int omap_dma_terminate_all(struct omap_chan *c)
+static int omap_dma_terminate_all(struct dma_chan *chan)
 {
+       struct omap_chan *c = to_omap_dma_chan(chan);
        struct omap_dmadev *d = to_omap_dma_dev(c->vc.chan.device);
        unsigned long flags;
        LIST_HEAD(head);
@@ -978,6 +981,7 @@ static int omap_dma_terminate_all(struct omap_chan *c)
         * c->desc is NULL and exit.)
         */
        if (c->desc) {
+               omap_dma_desc_free(&c->desc->vd);
                c->desc = NULL;
                /* Avoid stopping the dma twice */
                if (!c->paused)
@@ -996,8 +1000,10 @@ static int omap_dma_terminate_all(struct omap_chan *c)
        return 0;
 }
 
-static int omap_dma_pause(struct omap_chan *c)
+static int omap_dma_pause(struct dma_chan *chan)
 {
+       struct omap_chan *c = to_omap_dma_chan(chan);
+
        /* Pause/Resume only allowed with cyclic mode */
        if (!c->cyclic)
                return -EINVAL;
@@ -1010,8 +1016,10 @@ static int omap_dma_pause(struct omap_chan *c)
        return 0;
 }
 
-static int omap_dma_resume(struct omap_chan *c)
+static int omap_dma_resume(struct dma_chan *chan)
 {
+       struct omap_chan *c = to_omap_dma_chan(chan);
+
        /* Pause/Resume only allowed with cyclic mode */
        if (!c->cyclic)
                return -EINVAL;
@@ -1029,37 +1037,6 @@ static int omap_dma_resume(struct omap_chan *c)
        return 0;
 }
 
-static int omap_dma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
-       unsigned long arg)
-{
-       struct omap_chan *c = to_omap_dma_chan(chan);
-       int ret;
-
-       switch (cmd) {
-       case DMA_SLAVE_CONFIG:
-               ret = omap_dma_slave_config(c, (struct dma_slave_config *)arg);
-               break;
-
-       case DMA_TERMINATE_ALL:
-               ret = omap_dma_terminate_all(c);
-               break;
-
-       case DMA_PAUSE:
-               ret = omap_dma_pause(c);
-               break;
-
-       case DMA_RESUME:
-               ret = omap_dma_resume(c);
-               break;
-
-       default:
-               ret = -ENXIO;
-               break;
-       }
-
-       return ret;
-}
-
 static int omap_dma_chan_init(struct omap_dmadev *od, int dma_sig)
 {
        struct omap_chan *c;
@@ -1094,19 +1071,6 @@ static void omap_dma_free(struct omap_dmadev *od)
                                 BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \
                                 BIT(DMA_SLAVE_BUSWIDTH_4_BYTES))
 
-static int omap_dma_device_slave_caps(struct dma_chan *dchan,
-                                     struct dma_slave_caps *caps)
-{
-       caps->src_addr_widths = OMAP_DMA_BUSWIDTHS;
-       caps->dstn_addr_widths = OMAP_DMA_BUSWIDTHS;
-       caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
-       caps->cmd_pause = true;
-       caps->cmd_terminate = true;
-       caps->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
-
-       return 0;
-}
-
 static int omap_dma_probe(struct platform_device *pdev)
 {
        struct omap_dmadev *od;
@@ -1136,8 +1100,14 @@ static int omap_dma_probe(struct platform_device *pdev)
        od->ddev.device_issue_pending = omap_dma_issue_pending;
        od->ddev.device_prep_slave_sg = omap_dma_prep_slave_sg;
        od->ddev.device_prep_dma_cyclic = omap_dma_prep_dma_cyclic;
-       od->ddev.device_control = omap_dma_control;
-       od->ddev.device_slave_caps = omap_dma_device_slave_caps;
+       od->ddev.device_config = omap_dma_slave_config;
+       od->ddev.device_pause = omap_dma_pause;
+       od->ddev.device_resume = omap_dma_resume;
+       od->ddev.device_terminate_all = omap_dma_terminate_all;
+       od->ddev.src_addr_widths = OMAP_DMA_BUSWIDTHS;
+       od->ddev.dst_addr_widths = OMAP_DMA_BUSWIDTHS;
+       od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
+       od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
        od->ddev.dev = &pdev->dev;
        INIT_LIST_HEAD(&od->ddev.channels);
        INIT_LIST_HEAD(&od->pending);