Commit 10b3e223 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Vinod Koul

dmaengine: k3: fix duplicate function definition

Commit db08425e ("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: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: db08425e ("dmaengine: k3: Split device_control")
Reported-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent a1a9becb
...@@ -804,7 +804,7 @@ static int k3_dma_remove(struct platform_device *op) ...@@ -804,7 +804,7 @@ static int k3_dma_remove(struct platform_device *op)
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int k3_dma_suspend(struct device *dev) static int k3_dma_suspend_dev(struct device *dev)
{ {
struct k3_dma_dev *d = dev_get_drvdata(dev); struct k3_dma_dev *d = dev_get_drvdata(dev);
u32 stat = 0; u32 stat = 0;
...@@ -820,7 +820,7 @@ static int k3_dma_suspend(struct device *dev) ...@@ -820,7 +820,7 @@ static int k3_dma_suspend(struct device *dev)
return 0; return 0;
} }
static int k3_dma_resume(struct device *dev) static int k3_dma_resume_dev(struct device *dev)
{ {
struct k3_dma_dev *d = dev_get_drvdata(dev); struct k3_dma_dev *d = dev_get_drvdata(dev);
int ret = 0; int ret = 0;
...@@ -835,7 +835,7 @@ static int k3_dma_resume(struct device *dev) ...@@ -835,7 +835,7 @@ static int k3_dma_resume(struct device *dev)
} }
#endif #endif
static SIMPLE_DEV_PM_OPS(k3_dma_pmops, k3_dma_suspend, k3_dma_resume); static SIMPLE_DEV_PM_OPS(k3_dma_pmops, k3_dma_suspend_dev, k3_dma_resume_dev);
static struct platform_driver k3_pdma_driver = { static struct platform_driver k3_pdma_driver = {
.driver = { .driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment