summaryrefslogtreecommitdiffstats
path: root/drivers/dma/sh
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2015-01-21 00:09:46 +0300
committerVinod Koul <vinod.koul@intel.com>2015-02-12 12:52:17 +0530
commit82bf90c62834842249c4f94535079f5cbec9014c (patch)
tree7f7974c660928ba1d485bfe84059dd07ced278be /drivers/dma/sh
parent0091b9d6c1ef2caab6cb3b6c0aa75f9948307856 (diff)
downloadblackbird-op-linux-82bf90c62834842249c4f94535079f5cbec9014c.tar.gz
blackbird-op-linux-82bf90c62834842249c4f94535079f5cbec9014c.zip
dmaengine: shdmac: use SET_RUNTIME_PM_OPS()
Use SET_RUNTIME_PM_OPS() to initialize the runtime PM method pointers in the 'struct dev_pm_ops'; since that macro doesn't do anything if CONFIG_PM is not defined, we have to move #ifdef up to also cover the runtime PM methods in order to avoid compilation warnings. Based on orignal patch by Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/sh')
-rw-r--r--drivers/dma/sh/shdmac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
index ce4cd6be07cf..023344f7f78e 100644
--- a/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
@@ -588,6 +588,7 @@ static void sh_dmae_shutdown(struct platform_device *pdev)
sh_dmae_ctl_stop(shdev);
}
+#ifdef CONFIG_PM
static int sh_dmae_runtime_suspend(struct device *dev)
{
return 0;
@@ -600,7 +601,6 @@ static int sh_dmae_runtime_resume(struct device *dev)
return sh_dmae_rst(shdev);
}
-#ifdef CONFIG_PM
static int sh_dmae_suspend(struct device *dev)
{
return 0;
@@ -640,8 +640,8 @@ static int sh_dmae_resume(struct device *dev)
static const struct dev_pm_ops sh_dmae_pm = {
.suspend = sh_dmae_suspend,
.resume = sh_dmae_resume,
- .runtime_suspend = sh_dmae_runtime_suspend,
- .runtime_resume = sh_dmae_runtime_resume,
+ SET_RUNTIME_PM_OPS(sh_dmae_runtime_suspend, sh_dmae_runtime_resume,
+ NULL)
};
static dma_addr_t sh_dmae_slave_addr(struct shdma_chan *schan)
OpenPOWER on IntegriCloud