lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: addi_apci_3120: remove test for dma support

Browse Source 
The boards supported by this driver support dma. Remove the tests
for it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2012-11-01 17:26:00 -07:00
committed by Greg Kroah-Hartman
parent 48fdf08418
commit 4fbe36f2e9
1 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/staging/comedi/drivers/addi_apci_3120.c
View File

@@ -29,7 +29,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrDiChannel = 4, .i_NbrDiChannel = 4,
.i_NbrDoChannel = 4, .i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f, .i_DoMaxdata = 0x0f,
.i_Dma = 1,
.i_Timer = 1, .i_Timer = 1,
.b_AvailableConvertUnit = 1, .b_AvailableConvertUnit = 1,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
@@ -65,7 +64,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrDiChannel = 4, .i_NbrDiChannel = 4,
.i_NbrDoChannel = 4, .i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f, .i_DoMaxdata = 0x0f,
.i_Dma = 1,
.i_Timer = 1, .i_Timer = 1,
.b_AvailableConvertUnit = 1, .b_AvailableConvertUnit = 1,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
@@ -144,8 +142,7 @@ static int apci3120_attach_pci(struct comedi_device *dev,
ret = comedi_pci_enable(pcidev, dev->board_name); ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret) if (ret)
return ret; return ret;
if (this_board->i_Dma) pci_set_master(pcidev);
pci_set_master(pcidev);
if (this_board->i_IorangeBase1) if (this_board->i_IorangeBase1)
dev->iobase = pci_resource_start(pcidev, 1); dev->iobase = pci_resource_start(pcidev, 1);
@@ -166,37 +163,31 @@ static int apci3120_attach_pci(struct comedi_device *dev,
devpriv->us_UseDma = ADDI_ENABLE; devpriv->us_UseDma = ADDI_ENABLE;
if (this_board->i_Dma) { /* Allocate DMA buffers */
if (devpriv->us_UseDma == ADDI_ENABLE) { devpriv->b_DmaDoubleBuffer = 0;
/* alloc DMA buffers */ for (i = 0; i < 2; i++) {
devpriv->b_DmaDoubleBuffer = 0; for (pages = 4; pages >= 0; pages--) {
for (i = 0; i < 2; i++) { devpriv->ul_DmaBufferVirtual[i] =
for (pages = 4; pages >= 0; pages--) { (void *) __get_free_pages(GFP_KERNEL, pages);
devpriv->ul_DmaBufferVirtual[i] =
(void *) __get_free_pages(GFP_KERNEL, pages);
if (devpriv->ul_DmaBufferVirtual[i]) if (devpriv->ul_DmaBufferVirtual[i])
break; break;
} }
if (devpriv->ul_DmaBufferVirtual[i]) { if (devpriv->ul_DmaBufferVirtual[i]) {
devpriv->ui_DmaBufferPages[i] = pages; devpriv->ui_DmaBufferPages[i] = pages;
devpriv->ui_DmaBufferSize[i] = devpriv->ui_DmaBufferSize[i] = PAGE_SIZE * pages;
PAGE_SIZE * pages; devpriv->ui_DmaBufferSamples[i] =
devpriv->ui_DmaBufferSamples[i] = devpriv->ui_DmaBufferSize[i] >> 1;
devpriv-> devpriv->ul_DmaBufferHw[i] =
ui_DmaBufferSize[i] >> 1; virt_to_bus((void *)devpriv->
devpriv->ul_DmaBufferHw[i] = ul_DmaBufferVirtual[i]);
virt_to_bus((void *)devpriv->
ul_DmaBufferVirtual[i]);
}
}
if (!devpriv->ul_DmaBufferVirtual[0])
devpriv->us_UseDma = ADDI_DISABLE;
if (devpriv->ul_DmaBufferVirtual[1])
devpriv->b_DmaDoubleBuffer = 1;
} }
} }
if (!devpriv->ul_DmaBufferVirtual[0])
devpriv->us_UseDma = ADDI_DISABLE;
if (devpriv->ul_DmaBufferVirtual[1])
devpriv->b_DmaDoubleBuffer = 1;
n_subdevices = 7; n_subdevices = 7;
ret = comedi_alloc_subdevices(dev, n_subdevices); ret = comedi_alloc_subdevices(dev, n_subdevices);