Skip to contentSkip to conversation

dmaengine: shdma: fix a build failure on platforms with no DMA support

PATCH New Simon Horman 2 participants 2 messages Jul 17, 2013 – Jul 23, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dmaengine: shdma: fix a build failure on platforms with no DMA support

From: Guennadi Liakhovetski <[email protected]>

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.

[horms+renesas at verge.net.au: Apply change to shdma-base.h instead of sh_dma.h]
---
 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.

Alternatively, I would be happy to take this through the renesas tree.

I posted this patch last week but I'm wondering if you missed it somehow. This patch resolves a regression in v3.11-rc1.

include/linux/shdma-base.h +4 -0
index 382cf71..5b1c984 100644
@@ -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
Signature · 6 lines
1.8.2.1

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#1 lore raw

PATCH 1/1 dmaengine: shdma: fix a build failure on platforms with no DMA support

Quoted 20 lines · Simon Horman

From: Guennadi Liakhovetski <[email protected]>

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.

[[email protected]: Apply change to shdma-base.h instead of sh_dma.h]
---
 include/linux/shdma-base.h | 4 ++++
 1 file changed, 4 insertions(+)

Hi Vinod,

Quoted 8 lines

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.

Alternatively, I would be happy to take this through the renesas tree.

I posted this patch last week but I'm wondering if you missed it somehow. This patch resolves a regression in v3.11-rc1.

As mentioned on the other thread, I have applied this in the arm-soc fixes branch for 3.11 now.

-Olof