|
@@ -499,18 +499,18 @@ static void gsc_hpdi_free_dma(struct comedi_device *dev)
|
|
/* free pci dma buffers */
|
|
/* free pci dma buffers */
|
|
for (i = 0; i < NUM_DMA_BUFFERS; i++) {
|
|
for (i = 0; i < NUM_DMA_BUFFERS; i++) {
|
|
if (devpriv->dio_buffer[i])
|
|
if (devpriv->dio_buffer[i])
|
|
- pci_free_consistent(pcidev,
|
|
|
|
- DMA_BUFFER_SIZE,
|
|
|
|
- devpriv->dio_buffer[i],
|
|
|
|
- devpriv->dio_buffer_phys_addr[i]);
|
|
|
|
|
|
+ dma_free_coherent(&pcidev->dev,
|
|
|
|
+ DMA_BUFFER_SIZE,
|
|
|
|
+ devpriv->dio_buffer[i],
|
|
|
|
+ devpriv->dio_buffer_phys_addr[i]);
|
|
}
|
|
}
|
|
/* free dma descriptors */
|
|
/* free dma descriptors */
|
|
if (devpriv->dma_desc)
|
|
if (devpriv->dma_desc)
|
|
- pci_free_consistent(pcidev,
|
|
|
|
- sizeof(struct plx_dma_desc) *
|
|
|
|
- NUM_DMA_DESCRIPTORS,
|
|
|
|
- devpriv->dma_desc,
|
|
|
|
- devpriv->dma_desc_phys_addr);
|
|
|
|
|
|
+ dma_free_coherent(&pcidev->dev,
|
|
|
|
+ sizeof(struct plx_dma_desc) *
|
|
|
|
+ NUM_DMA_DESCRIPTORS,
|
|
|
|
+ devpriv->dma_desc,
|
|
|
|
+ devpriv->dma_desc_phys_addr);
|
|
}
|
|
}
|
|
|
|
|
|
static int gsc_hpdi_init(struct comedi_device *dev)
|
|
static int gsc_hpdi_init(struct comedi_device *dev)
|
|
@@ -630,14 +630,16 @@ static int gsc_hpdi_auto_attach(struct comedi_device *dev,
|
|
/* allocate pci dma buffers */
|
|
/* allocate pci dma buffers */
|
|
for (i = 0; i < NUM_DMA_BUFFERS; i++) {
|
|
for (i = 0; i < NUM_DMA_BUFFERS; i++) {
|
|
devpriv->dio_buffer[i] =
|
|
devpriv->dio_buffer[i] =
|
|
- pci_alloc_consistent(pcidev, DMA_BUFFER_SIZE,
|
|
|
|
- &devpriv->dio_buffer_phys_addr[i]);
|
|
|
|
|
|
+ dma_alloc_coherent(&pcidev->dev, DMA_BUFFER_SIZE,
|
|
|
|
+ &devpriv->dio_buffer_phys_addr[i],
|
|
|
|
+ GFP_KERNEL);
|
|
}
|
|
}
|
|
/* allocate dma descriptors */
|
|
/* allocate dma descriptors */
|
|
- devpriv->dma_desc = pci_alloc_consistent(pcidev,
|
|
|
|
- sizeof(struct plx_dma_desc) *
|
|
|
|
- NUM_DMA_DESCRIPTORS,
|
|
|
|
- &devpriv->dma_desc_phys_addr);
|
|
|
|
|
|
+ devpriv->dma_desc = dma_alloc_coherent(&pcidev->dev,
|
|
|
|
+ sizeof(struct plx_dma_desc) *
|
|
|
|
+ NUM_DMA_DESCRIPTORS,
|
|
|
|
+ &devpriv->dma_desc_phys_addr,
|
|
|
|
+ GFP_KERNEL);
|
|
if (devpriv->dma_desc_phys_addr & 0xf) {
|
|
if (devpriv->dma_desc_phys_addr & 0xf) {
|
|
dev_warn(dev->class_dev,
|
|
dev_warn(dev->class_dev,
|
|
" dma descriptors not quad-word aligned (bug)\n");
|
|
" dma descriptors not quad-word aligned (bug)\n");
|