aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-01-13 08:23:13 -0500
committerVinod Koul <vinod.koul@intel.com>2015-01-13 10:50:09 -0500
commit10b3e223174f28eabadab18b5dfa36021d956a2d (patch)
tree568f02d744c7ba516e29b93029c5a4494c4cd8ae
parenta1a9becbf35899cd44ac1bea4a04f98e5adc9ffb (diff)
dmaengine: k3: fix duplicate function definition
Commit db08425ebd51f ("dmaengine: k3: Split device_control") introduced two new helper functions, which unfortunately have the same names as the existing suspend/resume functions, resulting in a build error when CONFIG_PM_SLEEP is enabled: drivers/dma/k3dma.c:823:12: error: conflicting types for 'k3_dma_resume' static int k3_dma_resume(struct device *dev) ^ drivers/dma/k3dma.c:625:12: note: previous definition of 'k3_dma_resume' was here static int k3_dma_resume(struct dma_chan *chan) ^ Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: db08425ebd51f ("dmaengine: k3: Split device_control") Reported-by: Mark Brown <broonie@kernel.org> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--drivers/dma/k3dma.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index a4ff7e9e68be..6f7f43529ccb 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -804,7 +804,7 @@ static int k3_dma_remove(struct platform_device *op)
804} 804}
805 805
806#ifdef CONFIG_PM_SLEEP 806#ifdef CONFIG_PM_SLEEP
807static int k3_dma_suspend(struct device *dev) 807static int k3_dma_suspend_dev(struct device *dev)
808{ 808{
809 struct k3_dma_dev *d = dev_get_drvdata(dev); 809 struct k3_dma_dev *d = dev_get_drvdata(dev);
810 u32 stat = 0; 810 u32 stat = 0;
@@ -820,7 +820,7 @@ static int k3_dma_suspend(struct device *dev)
820 return 0; 820 return 0;
821} 821}
822 822
823static int k3_dma_resume(struct device *dev) 823static int k3_dma_resume_dev(struct device *dev)
824{ 824{
825 struct k3_dma_dev *d = dev_get_drvdata(dev); 825 struct k3_dma_dev *d = dev_get_drvdata(dev);
826 int ret = 0; 826 int ret = 0;
@@ -835,7 +835,7 @@ static int k3_dma_resume(struct device *dev)
835} 835}
836#endif 836#endif
837 837
838static SIMPLE_DEV_PM_OPS(k3_dma_pmops, k3_dma_suspend, k3_dma_resume); 838static SIMPLE_DEV_PM_OPS(k3_dma_pmops, k3_dma_suspend_dev, k3_dma_resume_dev);
839 839
840static struct platform_driver k3_pdma_driver = { 840static struct platform_driver k3_pdma_driver = {
841 .driver = { 841 .driver = {