staging: comedi: addi-data: remove attach option to disable dma
This pci driver currently uses the comedi legacy attach mechanism which allows the user to pass configuration options to the driver when it is attached to the comedi subsystem. The use of these configuration options is preventing the conversion of the addi-data drivers to the comedi auto attach mechanism. For the addi-data drivers, option[2] is used to enable/disable dma. The default (0) action is to enable dma is the driver supports it. Remove this configuration option and just enable dma if it is supported. 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:
parent
ade6c03da5
commit
f7a9fd153b
|
@ -40,9 +40,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
|
|||
| option[0] - PCI bus number - if bus number and slot number are 0, |
|
||||
| then driver search for first unused card |
|
||||
| option[1] - PCI slot number |
|
||||
| |
|
||||
| option[2] = 0 - DMA ENABLE |
|
||||
| = 1 - DMA DISABLE |
|
||||
+----------+-----------+------------------------------------------------+
|
||||
*/
|
||||
|
||||
|
@ -94,7 +91,6 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
|||
unsigned int dw_Dummy;
|
||||
resource_size_t iobase_a, iobase_main, iobase_addon, iobase_reserved;
|
||||
struct pcilst_struct *card = NULL;
|
||||
int i_Dma = 0;
|
||||
|
||||
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
|
||||
if (!devpriv)
|
||||
|
@ -106,10 +102,6 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
|||
pci_list_builded = 1;
|
||||
}
|
||||
|
||||
if ((this_board->i_Dma) && (it->options[2] == 0)) {
|
||||
i_Dma = 1;
|
||||
}
|
||||
|
||||
card = ptr_select_and_alloc_pci_card(this_board->i_VendorId,
|
||||
this_board->i_DeviceId,
|
||||
it->options[0],
|
||||
|
@ -122,7 +114,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
|||
ret = comedi_pci_enable(pcidev, "addi_amcc_s5933");
|
||||
if (ret)
|
||||
return ret;
|
||||
if (i_Dma)
|
||||
if (this_board->i_Dma)
|
||||
pci_set_master(pcidev);
|
||||
card->used = 1;
|
||||
devpriv->allocated = 1;
|
||||
|
|
Reference in New Issue