dmaengine: cppi41: Split device_control

Split the device_control callback of the TI CPPI41 DMA driver to make use
of the newly introduced callbacks, that will eventually be used to retrieve
slave capabilities.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c
index b743adf56465644670ed77f4a4153cce9015491a..512cb8e2805e797ef12760d2e445652186410137 100644 (file)
--- a/drivers/dma/cppi41.c
+++ b/drivers/dma/cppi41.c
@@ -525,12 +525,6 @@ static struct dma_async_tx_descriptor *cppi41_dma_prep_slave_sg(
        return &c->txd;
 }
 
-static int cpp41_cfg_chan(struct cppi41_channel *c,
-               struct dma_slave_config *cfg)
-{
-       return 0;
-}
-
 static void cppi41_compute_td_desc(struct cppi41_desc *d)
 {
        d->pd0 = DESC_TYPE_TEARD << DESC_TYPE;
@@ -647,28 +641,6 @@ static int cppi41_stop_chan(struct dma_chan *chan)
        return 0;
 }
 
-static int cppi41_dma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
-       unsigned long arg)
-{
-       struct cppi41_channel *c = to_cpp41_chan(chan);
-       int ret;
-
-       switch (cmd) {
-       case DMA_SLAVE_CONFIG:
-               ret = cpp41_cfg_chan(c, (struct dma_slave_config *) arg);
-               break;
-
-       case DMA_TERMINATE_ALL:
-               ret = cppi41_stop_chan(chan);
-               break;
-
-       default:
-               ret = -ENXIO;
-               break;
-       }
-       return ret;
-}
-
 static void cleanup_chans(struct cppi41_dd *cdd)
 {
        while (!list_empty(&cdd->ddev.channels)) {
@@ -953,7 +925,7 @@ static int cppi41_dma_probe(struct platform_device *pdev)
        cdd->ddev.device_tx_status = cppi41_dma_tx_status;
        cdd->ddev.device_issue_pending = cppi41_dma_issue_pending;
        cdd->ddev.device_prep_slave_sg = cppi41_dma_prep_slave_sg;
-       cdd->ddev.device_control = cppi41_dma_control;
+       cdd->ddev.device_terminate_all = cppi41_stop_chan;
        cdd->ddev.dev = dev;
        INIT_LIST_HEAD(&cdd->ddev.channels);
        cpp41_dma_info.dma_cap = cdd->ddev.cap_mask;