sh: Revamp PCI DMA coherence Kconfig bits.

Leaving this configurable caused more trouble than it was ever worth, so
just make it explicit. Boards that are verified one way or the other can
fix up their selects accordingly. We presently default to non-coherent
for most platforms.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/sh/kernel/dma-nommu.c b/arch/sh/kernel/dma-nommu.c
index b336fcf40f12..3c55b87f8b63 100644
--- a/arch/sh/kernel/dma-nommu.c
+++ b/arch/sh/kernel/dma-nommu.c
@@ -44,6 +44,7 @@ static int nommu_map_sg(struct device *dev, struct scatterlist *sg,
         return nents;
 }
 
+#ifdef CONFIG_DMA_NONCOHERENT
 static void nommu_sync_single(struct device *dev, dma_addr_t addr,
                               size_t size, enum dma_data_direction dir)
 {
@@ -59,14 +60,17 @@ static void nommu_sync_sg(struct device *dev, struct scatterlist *sg,
         for_each_sg(sg, s, nelems, i)
                 dma_cache_sync(dev, sg_virt(s), s->length, dir);
 }
+#endif
 
 struct dma_map_ops nommu_dma_ops = {
         .alloc_coherent         = dma_generic_alloc_coherent,
         .free_coherent          = dma_generic_free_coherent,
         .map_page               = nommu_map_page,
         .map_sg                 = nommu_map_sg,
+#ifdef CONFIG_DMA_NONCOHERENT
         .sync_single_for_device = nommu_sync_single,
         .sync_sg_for_device     = nommu_sync_sg,
+#endif
         .is_phys                = 1,
 };