* -next build failures in k3dma.c [not found] <E1YAwSG-0000zm-Cs@debutante> @ 2015-01-13 12:07 ` Mark Brown 2015-01-13 13:20 ` Arnd Bergmann 2015-01-13 13:23 ` Arnd Bergmann 0 siblings, 2 replies; 7+ messages in thread From: Mark Brown @ 2015-01-13 12:07 UTC (permalink / raw) To: Maxime Ripard, Vinod Koul Cc: kernel-build-reports, linaro-kernel, linux-kernel, linux-arm-kernel [-- Attachment #1: Type: text/plain, Size: 491 bytes --] On Tue, Jan 13, 2015 at 08:04:00AM +0000, Build bot for Mark Brown wrote: > arm-allmodconfig > ../drivers/dma/k3dma.c:823:12: error: conflicting types for 'k3_dma_resume' For several days now k3dma.c has been failing to build in an ARM allmodconfig because the definition of k3_dma_resume() introduced in db08425ebd51f (dmaengine: k3: Split device_control) taking a struct dma_chan * conflicts with that which has been in the file since it was originally merged taking a struct device *. [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 473 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* -next build failures in k3dma.c 2015-01-13 12:07 ` -next build failures in k3dma.c Mark Brown @ 2015-01-13 13:20 ` Arnd Bergmann 2015-01-13 13:23 ` Arnd Bergmann 1 sibling, 0 replies; 7+ messages in thread From: Arnd Bergmann @ 2015-01-13 13:20 UTC (permalink / raw) To: linux-arm-kernel On Tuesday 13 January 2015 12:07:51 Mark Brown wrote: > On Tue, Jan 13, 2015 at 08:04:00AM +0000, Build bot for Mark Brown wrote: > > > arm-allmodconfig > > ../drivers/dma/k3dma.c:823:12: error: conflicting types for 'k3_dma_resume' > > For several days now k3dma.c has been failing to build in an ARM > allmodconfig because the definition of k3_dma_resume() introduced in > db08425ebd51f (dmaengine: k3: Split device_control) taking a struct > dma_chan * conflicts with that which has been in the file since it was > originally merged taking a struct device *. Incidentally, I've restarted by randconfig build testing today, will follow up with my fix. Arnd ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: -next build failures in k3dma.c @ 2015-01-13 13:20 ` Arnd Bergmann 0 siblings, 0 replies; 7+ messages in thread From: Arnd Bergmann @ 2015-01-13 13:20 UTC (permalink / raw) To: kernel-build-reports Cc: Mark Brown, Maxime Ripard, Vinod Koul, linaro-kernel, linux-kernel, linux-arm-kernel On Tuesday 13 January 2015 12:07:51 Mark Brown wrote: > On Tue, Jan 13, 2015 at 08:04:00AM +0000, Build bot for Mark Brown wrote: > > > arm-allmodconfig > > ../drivers/dma/k3dma.c:823:12: error: conflicting types for 'k3_dma_resume' > > For several days now k3dma.c has been failing to build in an ARM > allmodconfig because the definition of k3_dma_resume() introduced in > db08425ebd51f (dmaengine: k3: Split device_control) taking a struct > dma_chan * conflicts with that which has been in the file since it was > originally merged taking a struct device *. Incidentally, I've restarted by randconfig build testing today, will follow up with my fix. Arnd ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] dmaengine: k3: fix duplicate function definition 2015-01-13 12:07 ` -next build failures in k3dma.c Mark Brown @ 2015-01-13 13:23 ` Arnd Bergmann 2015-01-13 13:23 ` Arnd Bergmann 1 sibling, 0 replies; 7+ messages in thread From: Arnd Bergmann @ 2015-01-13 13:23 UTC (permalink / raw) To: linux-arm-kernel 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") diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index 49be7f687c4c..8cc61ae42f42 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -804,7 +804,7 @@ static int k3_dma_remove(struct platform_device *op) } #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); u32 stat = 0; @@ -820,7 +820,7 @@ static int k3_dma_suspend(struct device *dev) 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); int ret = 0; @@ -835,7 +835,7 @@ static int k3_dma_resume(struct device *dev) } #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 = { .driver = { ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] dmaengine: k3: fix duplicate function definition @ 2015-01-13 13:23 ` Arnd Bergmann 0 siblings, 0 replies; 7+ messages in thread From: Arnd Bergmann @ 2015-01-13 13:23 UTC (permalink / raw) To: kernel-build-reports Cc: Mark Brown, Maxime Ripard, Vinod Koul, linaro-kernel, linux-kernel, linux-arm-kernel 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") diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index 49be7f687c4c..8cc61ae42f42 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -804,7 +804,7 @@ static int k3_dma_remove(struct platform_device *op) } #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); u32 stat = 0; @@ -820,7 +820,7 @@ static int k3_dma_suspend(struct device *dev) 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); int ret = 0; @@ -835,7 +835,7 @@ static int k3_dma_resume(struct device *dev) } #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 = { .driver = { ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] dmaengine: k3: fix duplicate function definition 2015-01-13 13:23 ` Arnd Bergmann @ 2015-01-13 14:42 ` Vinod Koul -1 siblings, 0 replies; 7+ messages in thread From: Vinod Koul @ 2015-01-13 14:42 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jan 13, 2015 at 02:23:13PM +0100, Arnd Bergmann wrote: > 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) Applied, Thanks -- ~Vinod ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] dmaengine: k3: fix duplicate function definition @ 2015-01-13 14:42 ` Vinod Koul 0 siblings, 0 replies; 7+ messages in thread From: Vinod Koul @ 2015-01-13 14:42 UTC (permalink / raw) To: Arnd Bergmann Cc: kernel-build-reports, Mark Brown, Maxime Ripard, linaro-kernel, linux-kernel, linux-arm-kernel On Tue, Jan 13, 2015 at 02:23:13PM +0100, Arnd Bergmann wrote: > 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) Applied, Thanks -- ~Vinod ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-01-13 14:44 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <E1YAwSG-0000zm-Cs@debutante>
2015-01-13 12:07 ` -next build failures in k3dma.c Mark Brown
2015-01-13 13:20 ` Arnd Bergmann
2015-01-13 13:20 ` Arnd Bergmann
2015-01-13 13:23 ` [PATCH] dmaengine: k3: fix duplicate function definition Arnd Bergmann
2015-01-13 13:23 ` Arnd Bergmann
2015-01-13 14:42 ` Vinod Koul
2015-01-13 14:42 ` Vinod Koul
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.