linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] dmaengine: shdma: fix a build failure on platforms with no DMA support
@ 2013-05-30 16:02 Guennadi Liakhovetski
  2013-05-30 16:23 ` Dan Murphy
  0 siblings, 1 reply; 14+ messages in thread
From: Guennadi Liakhovetski @ 2013-05-30 16:02 UTC (permalink / raw)
  To: linux-arm-kernel

On platforms with no support for the shdma dmaengine driver build is
currently failing with

drivers/built-in.o: In function `sh_mobile_sdhi_probe':
drivers/mmc/host/sh_mobile_sdhi.c:170: undefined reference to`shdma_chan_filter'

Fix the breakage by defining shdma_chan_filter to NULL in such
configurations.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
---

This is for "next." Compile-tested only. I'll test it on hardware next 
week, but I don't think it shall break anything.

 include/linux/sh_dma.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
index b64d6be..1fd8a20 100644
--- a/include/linux/sh_dma.h
+++ b/include/linux/sh_dma.h
@@ -99,6 +99,10 @@ struct sh_dmae_pdata {
 #define CHCR_TE	0x00000002
 #define CHCR_IE	0x00000004
 
+#if IS_ENABLED(CONFIG_SH_DMAE)
 bool shdma_chan_filter(struct dma_chan *chan, void *arg);
+#else
+#define shdma_chan_filter NULL
+#endif
 
 #endif
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH] dmaengine: shdma: fix a build failure on platforms with no DMA support
@ 2013-07-10  2:09 Simon Horman
  2013-07-16  1:20 ` Simon Horman
  0 siblings, 1 reply; 14+ messages in thread
From: Simon Horman @ 2013-07-10  2:09 UTC (permalink / raw)
  To: linux-arm-kernel

From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

On platforms with no support for the shdma dmaengine driver build is
currently failing with

drivers/built-in.o: In function `sh_mobile_sdhi_probe':
drivers/mmc/host/sh_mobile_sdhi.c:170: undefined reference to`shdma_chan_filter'

Fix the breakage by defining shdma_chan_filter to NULL in such
configurations.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
[horms+renesas at verge.net.au: Apply change to shdma-base.h instead of sh_dma.h]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 include/linux/shdma-base.h | 4 ++++
 1 file changed, 4 insertions(+)

Hi Vinod,

please consider this fix from Guennadi for v3.11 which I have rebased on top of
next-20130709. It fixes a build problem on a number of shmobile defconfigs
including bockw.

diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h
index 382cf71..5b1c984 100644
--- a/include/linux/shdma-base.h
+++ b/include/linux/shdma-base.h
@@ -124,6 +124,10 @@ void shdma_chan_remove(struct shdma_chan *schan);
 int shdma_init(struct device *dev, struct shdma_dev *sdev,
 		    int chan_num);
 void shdma_cleanup(struct shdma_dev *sdev);
+#if IS_ENABLED(CONFIG_SH_DMAE_BASE)
 bool shdma_chan_filter(struct dma_chan *chan, void *arg);
+#else
+#define shdma_chan_filter NULL
+#endif
 
 #endif
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2013-07-23  4:12 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-30 16:02 [PATCH] dmaengine: shdma: fix a build failure on platforms with no DMA support Guennadi Liakhovetski
2013-05-30 16:23 ` Dan Murphy
2013-05-31  2:44   ` Simon Horman
2013-06-19 19:00     ` Kevin Hilman
2013-06-19 19:32       ` Guennadi Liakhovetski
2013-07-05  4:53         ` Vinod Koul
2013-07-08  7:52           ` Olof Johansson
2013-07-08  7:21             ` Vinod Koul
2013-07-10  2:09               ` Simon Horman
2013-07-08  8:13           ` Guennadi Liakhovetski
  -- strict thread matches above, loose matches on Subject: below --
2013-07-10  2:09 Simon Horman
2013-07-16  1:20 ` Simon Horman
2013-07-23  2:39   ` Olof Johansson
2013-07-23  4:12     ` Simon Horman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).