Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 07:23:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dmaengine: k3: fix duplicate function definition

Browse Source 
Commit db08425ebd ("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: db08425ebd ("dmaengine: k3: Split device_control")
Reported-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Arnd Bergmann 2015-01-13 14:23:13 +01:00 committed by Vinod Koul
parent a1a9becbf3
commit 10b3e22317
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dma/k3dma.c
View File

@ -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)
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)
} }
#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 = {