From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 12 Jan 2015 17:56:15 +0000 (-0700)
Subject: staging: comedi: das16: board is not a PCI device
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ed07758759ad3fd2b7b18a1f821c2ad7e84376d0;p=linux-beck.git

staging: comedi: das16: board is not a PCI device

The DAS16 board is an ISA device not a PCI device. For aesthetics, use
dma_{alloc,free}_coherent() to allocate and free the DMA buffers instead
of the PCI versions.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index e0b41ae2cc36..294cd81f2009 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -72,7 +72,6 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 
 #include <asm/dma.h>
@@ -1010,8 +1009,8 @@ static int das16_alloc_dma(struct comedi_device *dev, unsigned int dma_chan)
 	for (i = 0; i < 2; i++) {
 		dma = &devpriv->dma_desc[i];
 
-		dma->virt_addr = pci_alloc_consistent(NULL, DAS16_DMA_SIZE,
-						      &dma->hw_addr);
+		dma->virt_addr = dma_alloc_coherent(NULL, DAS16_DMA_SIZE,
+						    &dma->hw_addr, GFP_KERNEL);
 		if (!dma->virt_addr)
 			return -ENOMEM;
 	}
@@ -1039,8 +1038,8 @@ static void das16_free_dma(struct comedi_device *dev)
 	for (i = 0; i < 2; i++) {
 		dma = &devpriv->dma_desc[i];
 		if (dma->virt_addr)
-			pci_free_consistent(NULL, DAS16_DMA_SIZE,
-					    dma->virt_addr, dma->hw_addr);
+			dma_free_coherent(NULL, DAS16_DMA_SIZE,
+					  dma->virt_addr, dma->hw_addr);
 	}
 	if (devpriv->dma_chan)
 		free_dma(devpriv->dma_chan);