The hwdrv_apci3501.c file is included by the addi_apci_3501 driver to provide the support code for the timer subdevice. The code in this file is broken with respect to how comedi works with subdevices. Tidy it up so that it can be fixed. H Hartley Sweeten (15): staging: comedi: hwdrv_apci3501: remove useless read/mask to stop watchdog staging: comedi: addi_apci_3501: rename private data 'b_TimerSelectMode' staging: comedi: hwdrv_apci3501: rename 'ul_Command1' in apci3501_write_insn_timer() staging: comedi: hwdrv_apci3501: refactor apci3501_write_insn_timer() staging: comedi: hwdrv_apci3501: refactor apci3501_read_insn_timer() staging: comedi: hwdrv_apci3501: rename 'ul_Command1' in apci3501_config_insn_timer() staging: comedi: hwdrv_apci3501: refactor apci3501_config_insn_timer() staging: comedi: addi_apci_3501: rename private data 'i_IobaseAmcc' staging: comedi: addi_apci_3501: prefer using the BIT macro staging: comedi: addi_apci_3501: rename CamelCase vars in apci3501_interrupt() staging: comedi: addi_apci_3501: use addi_tcw.h for the timer registers staging: comedi: addi_apci_3501: remove "magic" numbers in apci3501_interrupt() staging: comedi: hwdrv_apci3501: remove "magic" numbers in apci3501_config_insn_timer() staging: comedi: hwdrv_apci3501: remove "magic" numbers in apci3501_write_insn_timer() staging: comedi: hwdrv_apci3501: remove "magic" numbers in apci3501_read_insn_timer() .../comedi/drivers/addi-data/hwdrv_apci3501.c | 154 ++++++++------------- drivers/staging/comedi/drivers/addi_apci_3501.c | 60 ++++---- 2 files changed, 90 insertions(+), 124 deletions(-) -- 2.4.3 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel