6 files changed, 3 insertions, 13 deletions

diff --git a/drivers/dma/sh/rcar-audmapp.c b/drivers/dma/sh/rcar-audmapp.c
index 80fd2aeb4870..d95bbdd721f4 100644
--- a/drivers/dma/sh/rcar-audmapp.c
+++ b/drivers/dma/sh/rcar-audmapp.c
@@ -253,7 +253,6 @@ static int audmapp_chan_probe(struct platform_device *pdev,
 
 static void audmapp_chan_remove(struct audmapp_device *audev)
 {
-        struct dma_device *dma_dev = &audev->shdma_dev.dma_dev;
         struct shdma_chan *schan;
         int i;
 
@@ -261,7 +260,6 @@ static void audmapp_chan_remove(struct audmapp_device *audev)
                 BUG_ON(!schan);
                 shdma_chan_remove(schan);
         }
-        dma_dev->chancnt = 0;
 }
 
 static struct dma_chan *audmapp_of_xlate(struct of_phandle_args *dma_spec,
@@ -367,7 +365,6 @@ static struct platform_driver audmapp_driver = {
         .probe          = audmapp_probe,
         .remove         = audmapp_remove,
         .driver         = {
-                .owner  = THIS_MODULE,
                 .name   = "rcar-audmapp-engine",
                 .of_match_table = audmapp_of_match,
         },
diff --git a/drivers/dma/sh/rcar-hpbdma.c b/drivers/dma/sh/rcar-hpbdma.c
index b212d9471ab5..20a6f6f2a018 100644
--- a/drivers/dma/sh/rcar-hpbdma.c
+++ b/drivers/dma/sh/rcar-hpbdma.c
@@ -619,7 +619,6 @@ error:
 
 static void hpb_dmae_chan_remove(struct hpb_dmae_device *hpbdev)
 {
-        struct dma_device *dma_dev = &hpbdev->shdma_dev.dma_dev;
         struct shdma_chan *schan;
         int i;
 
@@ -628,7 +627,6 @@ static void hpb_dmae_chan_remove(struct hpb_dmae_device *hpbdev)
 
                 shdma_chan_remove(schan);
         }
-        dma_dev->chancnt = 0;
 }
 
 static int hpb_dmae_remove(struct platform_device *pdev)
@@ -655,7 +653,6 @@ static struct platform_driver hpb_dmae_driver = {
         .remove         = hpb_dmae_remove,
         .shutdown       = hpb_dmae_shutdown,
         .driver = {
-                .owner  = THIS_MODULE,
                 .name   = "hpb-dma-engine",
         },
 };
diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
index 42d497416196..3a2adb131d46 100644
--- a/drivers/dma/sh/shdma-base.c
+++ b/drivers/dma/sh/shdma-base.c
@@ -391,6 +391,8 @@ static dma_async_tx_callback __ld_cleanup(struct shdma_chan *schan, bool all)
                                 dev_dbg(schan->dev, "Bring down channel %d\n", schan->id);
                                 pm_runtime_put(schan->dev);
                                 schan->pm_state = SHDMA_PM_ESTABLISHED;
+                        } else if (schan->pm_state == SHDMA_PM_PENDING) {
+                                shdma_chan_xfer_ld_queue(schan);
                         }
                 }
         }
@@ -951,7 +953,7 @@ void shdma_chan_probe(struct shdma_dev *sdev,
         /* Add the channel to DMA device channel list */
         list_add_tail(&schan->dma_chan.device_node,
                         &sdev->dma_dev.channels);
-        sdev->schan[sdev->dma_dev.chancnt++] = schan;
+        sdev->schan[id] = schan;
 }
 EXPORT_SYMBOL(shdma_chan_probe);
 
diff --git a/drivers/dma/sh/shdma-of.c b/drivers/dma/sh/shdma-of.c
index b4ff9d3e56d1..f999f9b0d314 100644
--- a/drivers/dma/sh/shdma-of.c
+++ b/drivers/dma/sh/shdma-of.c
@@ -66,7 +66,6 @@ MODULE_DEVICE_TABLE(of, sh_dmae_of_match);
 
 static struct platform_driver shdma_of = {
         .driver         = {
-                .owner  = THIS_MODULE,
                 .name   = "shdma-of",
                 .of_match_table = shdma_of_match,
         },
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
index 58eb85770eba..b65317c6ea4e 100644
--- a/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
@@ -572,7 +572,6 @@ err_no_irq:
 
 static void sh_dmae_chan_remove(struct sh_dmae_device *shdev)
 {
-        struct dma_device *dma_dev = &shdev->shdma_dev.dma_dev;
         struct shdma_chan *schan;
         int i;
 
@@ -581,7 +580,6 @@ static void sh_dmae_chan_remove(struct sh_dmae_device *shdev)
 
                 shdma_chan_remove(schan);
         }
-        dma_dev->chancnt = 0;
 }
 
 static void sh_dmae_shutdown(struct platform_device *pdev)
diff --git a/drivers/dma/sh/sudmac.c b/drivers/dma/sh/sudmac.c
index 3ce103909896..6da2eaa6c294 100644
--- a/drivers/dma/sh/sudmac.c
+++ b/drivers/dma/sh/sudmac.c
@@ -295,7 +295,6 @@ err_no_irq:
 
 static void sudmac_chan_remove(struct sudmac_device *su_dev)
 {
-        struct dma_device *dma_dev = &su_dev->shdma_dev.dma_dev;
         struct shdma_chan *schan;
         int i;
 
@@ -304,7 +303,6 @@ static void sudmac_chan_remove(struct sudmac_device *su_dev)
 
                 shdma_chan_remove(schan);
         }
-        dma_dev->chancnt = 0;
 }
 
 static dma_addr_t sudmac_slave_addr(struct shdma_chan *schan)
@@ -411,7 +409,6 @@ static int sudmac_remove(struct platform_device *pdev)
 
 static struct platform_driver sudmac_driver = {
         .driver         = {
-                .owner  = THIS_MODULE,
                 .name   = SUDMAC_DRV_NAME,
         },
         .probe          = sudmac_probe,