staging: fbtft: Disable DMA support if DMA is not available
authorGeert Uytterhoeven <geert@linux-m68k.org>
Fri, 24 Apr 2015 07:44:15 +0000 (09:44 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Apr 2015 14:51:21 +0000 (16:51 +0200)
If NO_DMA=y:

    drivers/built-in.o: In function `fbtft_framebuffer_alloc':
    (.text+0xb53cae): undefined reference to `dmam_alloc_coherent'

As DMA support is already optional, make it depend on HAS_DMA.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/fbtft/fbtft-core.c

index 53b748be2712479368e20c75d0c188f6b6630d5b..ce645213a5393b8bb37d27021afda16f389cd5f9 100644 (file)
@@ -47,9 +47,11 @@ static unsigned long debug;
 module_param(debug, ulong, 0);
 MODULE_PARM_DESC(debug, "override device debug level");
 
+#ifdef CONFIG_HAS_DMA
 static bool dma = true;
 module_param(dma, bool, 0);
 MODULE_PARM_DESC(dma, "Use DMA buffer");
+#endif
 
 
 void fbtft_dbg_hex(const struct device *dev, int groupsize,
@@ -856,10 +858,13 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
 #endif
 
        if (txbuflen > 0) {
+#ifdef CONFIG_HAS_DMA
                if (dma) {
                        dev->coherent_dma_mask = ~0;
                        txbuf = dmam_alloc_coherent(dev, txbuflen, &par->txbuf.dma, GFP_DMA);
-               } else {
+               } else
+#endif
+               {
                        txbuf = devm_kzalloc(par->info->device, txbuflen, GFP_KERNEL);
                }
                if (!txbuf)