This addi-data driver and the addi_apci_3001 driver share common low-level code. Merge them to make maintenance easier. These drivers are the only addi-data drivers that have dma support. Separate them from the "common" code in addi_common.c. Remove some of the extra cruft that is unnecessary after the separation. H Hartley Sweeten (27): staging: comedi: addi_apci_3120: merge in addi_apci_3001 driver staging: comedi: addi_apci_3120: remove CONFIG_APCI_3120 define staging: comedi: addi_apci_3120: separate from addi_common.c staging: comedi: addi_common: remove dma setup/free code staging: comedi: addi_apci_3120: remove eeprom handling code staging: comedi: addi_apci_3120: board does not have ttl i/o staging: comedi: addi_apci_3120: remove need for s_EeParameters staging: comedi: addi_apci_3120: remove test for dma support staging: comedi: addi_apci_3120: remove test for timer support staging: comedi: addi_apci_3120: remove test for DO subdevice staging: comedi: addi_apci_3120: remove test for DI subdevice staging: comedi: addi_apci_3120: remove test for AI subdevice staging: comedi: addi_apci_3120: clarify timer subdevice init staging: comedi: addi_apci_3120: clarify DO subdevice init staging: comedi: addi_apci_3120: clarify DI subdevice init staging: comedi: addi_apci_3120: clarify AI subdevice init staging: comedi: addi_apci_3120: remove i_ADDI_Reset() staging: comedi: addi_apci_3120: fix the number of subdevices staging: comedi: addi_apci_3120: remove the 'i_IorangeBase*' staging: comedi: addi_apci_3120: remove 'pr_AiRangelist' staging: comedi: addi_apci_3120: remove 'ui_MinAcquisitiontimeNs' staging: comedi: addi_apci_3120: remove 'ui_MinDelaytimeNs' staging: comedi: addi_apci_3120: remove 'b_AvailableConvertUnit' staging: comedi: addi_apci_3120: clarify AO subdevice init staging: comedi: addi_apci_3120: cleanup apci3120_detach() staging: comedi: addi_apci_3120: remove COMEDI_SUBD_TTLIO define staging: comedi: addi_apci_3120: cleanup addi_find_boardinfo() drivers/staging/comedi/Kconfig | 14 +- drivers/staging/comedi/drivers/Makefile | 1 - .../staging/comedi/drivers/addi-data/addi_common.c | 54 +---- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 35 ++- drivers/staging/comedi/drivers/addi_apci_3001.c | 88 ------- drivers/staging/comedi/drivers/addi_apci_3120.c | 256 ++++++++++++++++++--- 6 files changed, 238 insertions(+), 210 deletions(-) delete mode 100644 drivers/staging/comedi/drivers/addi_apci_3001.c -- 1.7.11 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
