dmaengine: shdma: prepare to stop using struct dma_chan::private

Using struct dma_chan::private is deprecated. To update the shdma driver to
stop using it we first have to eliminate internal runtime uses of it. After
that we will also be able to stop using it for channel configuration.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>

5 files changed, 18 insertions, 20 deletions

diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
index ff060d0da908..f75ebfa735c0 100644
--- a/drivers/dma/sh/shdma-base.c
+++ b/drivers/dma/sh/shdma-base.c
@@ -76,7 +76,7 @@ static dma_cookie_t shdma_tx_submit(struct dma_async_tx_descriptor *tx)
                 container_of(tx, struct shdma_desc, async_tx),
                 *last = desc;
         struct shdma_chan *schan = to_shdma_chan(tx->chan);
-        struct shdma_slave *slave = tx->chan->private;
+        struct shdma_slave *slave = schan->slave;
         dma_async_tx_callback callback = tx->callback;
         dma_cookie_t cookie;
         bool power_up;
@@ -208,6 +208,7 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
                 goto edescalloc;
         }
         schan->desc_num = NR_DESCS_PER_CHANNEL;
+        schan->slave = slave;
 
         for (i = 0; i < NR_DESCS_PER_CHANNEL; i++) {
                 desc = ops->embedded_desc(schan->desc, i);
@@ -365,9 +366,9 @@ static void shdma_free_chan_resources(struct dma_chan *chan)
         if (!list_empty(&schan->ld_queue))
                 shdma_chan_ld_cleanup(schan, true);
 
-        if (chan->private) {
+        if (schan->slave) {
                 /* The caller is holding dma_list_mutex */
-                struct shdma_slave *slave = chan->private;
+                struct shdma_slave *slave = schan->slave;
                 clear_bit(slave->slave_id, shdma_slave_used);
                 chan->private = NULL;
         }
@@ -558,7 +559,7 @@ static struct dma_async_tx_descriptor *shdma_prep_slave_sg(
         struct shdma_chan *schan = to_shdma_chan(chan);
         struct shdma_dev *sdev = to_shdma_dev(schan->dma_chan.device);
         const struct shdma_ops *ops = sdev->ops;
-        struct shdma_slave *slave = chan->private;
+        struct shdma_slave *slave = schan->slave;
         dma_addr_t slave_addr;
 
         if (!chan)
diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c
index f06906f281ac..9f0a2e507ac3 100644
--- a/drivers/dma/sh/shdma.c
+++ b/drivers/dma/sh/shdma.c
@@ -291,10 +291,8 @@ static void sh_dmae_setup_xfer(struct shdma_chan *schan,
                                                     shdma_chan);
 
         if (sslave) {
-                struct sh_dmae_slave *slave = container_of(sslave,
-                                        struct sh_dmae_slave, shdma_slave);
                 const struct sh_dmae_slave_config *cfg =
-                        slave->config;
+                        sh_chan->config;
 
                 dmae_set_dmars(sh_chan, cfg->mid_rid);
                 dmae_set_chcr(sh_chan, cfg->chcr);
@@ -326,13 +324,11 @@ static int sh_dmae_set_slave(struct shdma_chan *schan,
 {
         struct sh_dmae_chan *sh_chan = container_of(schan, struct sh_dmae_chan,
                                                     shdma_chan);
-        struct sh_dmae_slave *slave = container_of(sslave, struct sh_dmae_slave,
-                                                   shdma_slave);
         const struct sh_dmae_slave_config *cfg = dmae_find_slave(sh_chan, sslave->slave_id);
         if (!cfg)
                 return -ENODEV;
 
-        slave->config = cfg;
+        sh_chan->config = cfg;
 
         return 0;
 }
@@ -579,13 +575,12 @@ static int sh_dmae_resume(struct device *dev)
 
         for (i = 0; i < shdev->pdata->channel_num; i++) {
                 struct sh_dmae_chan *sh_chan = shdev->chan[i];
-                struct sh_dmae_slave *param = sh_chan->shdma_chan.dma_chan.private;
 
                 if (!sh_chan->shdma_chan.desc_num)
                         continue;
 
-                if (param) {
-                        const struct sh_dmae_slave_config *cfg = param->config;
+                if (sh_chan->shdma_chan.slave) {
+                        const struct sh_dmae_slave_config *cfg = sh_chan->config;
                         dmae_set_dmars(sh_chan, cfg->mid_rid);
                         dmae_set_chcr(sh_chan, cfg->chcr);
                 } else {
@@ -609,14 +604,15 @@ const struct dev_pm_ops sh_dmae_pm = {
 
 static dma_addr_t sh_dmae_slave_addr(struct shdma_chan *schan)
 {
-        struct sh_dmae_slave *param = schan->dma_chan.private;
+        struct sh_dmae_chan *sh_chan = container_of(schan,
+                                        struct sh_dmae_chan, shdma_chan);
 
         /*
-         * Implicit BUG_ON(!param)
-         * if (param != NULL), this is a successfully requested slave channel,
-         * therefore param->config != NULL too.
+         * Implicit BUG_ON(!sh_chan->config)
+         * This is an exclusive slave DMA operation, may only be called after a
+         * successful slave configuration.
          */
-        return param->config->addr;
+        return sh_chan->config->addr;
 }
 
 static struct shdma_desc *sh_dmae_embedded_desc(void *buf, int i)
diff --git a/drivers/dma/sh/shdma.h b/drivers/dma/sh/shdma.h
index 840e47d1c86c..9314e93225db 100644
--- a/drivers/dma/sh/shdma.h
+++ b/drivers/dma/sh/shdma.h
@@ -13,6 +13,7 @@
 #ifndef __DMA_SHDMA_H
 #define __DMA_SHDMA_H
 
+#include <linux/sh_dma.h>
 #include <linux/shdma-base.h>
 #include <linux/dmaengine.h>
 #include <linux/interrupt.h>
@@ -25,6 +26,7 @@ struct device;
 
 struct sh_dmae_chan {
         struct shdma_chan shdma_chan;
+        const struct sh_dmae_slave_config *config; /* Slave DMA configuration */
         int xmit_shift;                 /* log_2(bytes_per_xfer) */
         u32 __iomem *base;
         char dev_id[16];                /* unique name per DMAC of channel */
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
index 7c8ca41e60e6..a79f10a32243 100644
--- a/include/linux/sh_dma.h
+++ b/include/linux/sh_dma.h
@@ -20,8 +20,6 @@ struct device;
 /* Used by slave DMA clients to request DMA to/from a specific peripheral */
 struct sh_dmae_slave {
         struct shdma_slave              shdma_slave;    /* Set by the platform */
-        struct device                   *dma_dev;       /* Set by the platform */
-        const struct sh_dmae_slave_config *config;      /* Set by the driver */
 };
 
 /*
diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h
index 83efd1332b39..c3a19e9c20c4 100644
--- a/include/linux/shdma-base.h
+++ b/include/linux/shdma-base.h
@@ -66,6 +66,7 @@ struct shdma_chan {
         size_t max_xfer_len;            /* max transfer length */
         int id;                         /* Raw id of this channel */
         int irq;                        /* Channel IRQ */
+        struct shdma_slave *slave;      /* Client data for slave DMA */
         enum shdma_pm_state pm_state;
 };