The addi-data drivers are a bit of a mess and have a lot of bloat. The source files listed in the Makefile do a bunch of #include's of other c files to build the final drivers. This is a maintenance nightmare and just makes the drivers difficult to follow. Start breaking up the code by getting rid of all the ifdef'ery in addi_common.c by moving all the driver specific chunks to the correct source file. Also, get rid of all the unnecessary forward declarations to make future changes easier. H Hartley Sweeten (24): staging: comedi: addi_common: move module init code to EOF staging: comedi: addi-data: move the main #include's to the drivers staging: comedi: addi-data: remove this_board macro staging: comedi: addi-data: remove the addi-data #include ifdef'ery staging: comedi: addi-data: remove the MODULE_DEVICE_TABLE #ifdef'ery staging: comedi: addi-data: remove the boardinfo #ifdef'ery staging: comedi: addi_common: remove the extra cruft staging: comedi: addi_common: remove forward declarations staging: comedi: hwdrv_apci035: remove forward declarations staging: comedi: hwdrv_apci1032: remove forward declarations staging: comedi: hwdrv_apci1500: remove forward declarations staging: comedi: hwdrv_apci1516: remove forward declarations staging: comedi: hwdrv_apci1564: remove forward declarations staging: comedi: hwdrv_apci16xx: remove forward declarations staging: comedi: hwdrv_apci2016: remove forward declarations staging: comedi: hwdrv_apci2032: remove forward declarations staging: comedi: hwdrv_apci2200: remove forward declarations staging: comedi: hwdrv_apci3501: remove forward declarations staging: comedi: hwdrv_APCI1710: remove forward declarations staging: comedi: APCI1710_Dig_io: remove forward declarations staging: comedi: APCI1710_Inp_cpt: remove forward declarations staging: comedi: APCI1710_Ssi: remove forward declarations staging: comedi: APCI1710_Tor: remove forward declarations staging: comedi: APCI1710_Ttl: remove forward declarations .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 24 +- .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 21 - .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 24 +- .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 25 - .../comedi/drivers/addi-data/APCI1710_Ssi.c | 18 +- .../comedi/drivers/addi-data/APCI1710_Ssi.h | 12 - .../comedi/drivers/addi-data/APCI1710_Tor.c | 24 +- .../comedi/drivers/addi-data/APCI1710_Tor.h | 24 - .../comedi/drivers/addi-data/APCI1710_Ttl.c | 24 +- .../comedi/drivers/addi-data/APCI1710_Ttl.h | 22 - .../staging/comedi/drivers/addi-data/addi_common.c | 1534 +------------------- .../staging/comedi/drivers/addi-data/addi_common.h | 9 - .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1 + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 10 +- .../comedi/drivers/addi-data/hwdrv_apci035.c | 32 +- .../comedi/drivers/addi-data/hwdrv_apci035.h | 25 - .../comedi/drivers/addi-data/hwdrv_apci1032.c | 20 +- .../comedi/drivers/addi-data/hwdrv_apci1032.h | 21 - .../comedi/drivers/addi-data/hwdrv_apci1500.h | 49 - .../comedi/drivers/addi-data/hwdrv_apci1516.c | 50 +- .../comedi/drivers/addi-data/hwdrv_apci1516.h | 29 - .../comedi/drivers/addi-data/hwdrv_apci1564.c | 62 +- .../comedi/drivers/addi-data/hwdrv_apci1564.h | 42 - .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 30 +- .../comedi/drivers/addi-data/hwdrv_apci16xx.h | 39 - .../comedi/drivers/addi-data/hwdrv_apci2016.c | 38 +- .../comedi/drivers/addi-data/hwdrv_apci2016.h | 34 - .../comedi/drivers/addi-data/hwdrv_apci2032.c | 46 +- .../comedi/drivers/addi-data/hwdrv_apci2032.h | 30 - .../comedi/drivers/addi-data/hwdrv_apci2200.c | 50 +- .../comedi/drivers/addi-data/hwdrv_apci2200.h | 27 - .../comedi/drivers/addi-data/hwdrv_apci3120.c | 5 + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 58 +- .../comedi/drivers/addi-data/hwdrv_apci3501.h | 45 - .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 2 + drivers/staging/comedi/drivers/addi_apci_035.c | 42 + drivers/staging/comedi/drivers/addi_apci_1032.c | 33 + drivers/staging/comedi/drivers/addi_apci_1500.c | 44 + drivers/staging/comedi/drivers/addi_apci_1516.c | 40 + drivers/staging/comedi/drivers/addi_apci_1564.c | 43 + drivers/staging/comedi/drivers/addi_apci_16xx.c | 44 + drivers/staging/comedi/drivers/addi_apci_1710.c | 41 + drivers/staging/comedi/drivers/addi_apci_2016.c | 37 + drivers/staging/comedi/drivers/addi_apci_2032.c | 39 + drivers/staging/comedi/drivers/addi_apci_2200.c | 39 + drivers/staging/comedi/drivers/addi_apci_3001.c | 55 + drivers/staging/comedi/drivers/addi_apci_3120.c | 59 + drivers/staging/comedi/drivers/addi_apci_3200.c | 63 + drivers/staging/comedi/drivers/addi_apci_3300.c | 62 + drivers/staging/comedi/drivers/addi_apci_3501.c | 44 + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 808 +++++++++++ 51 files changed, 1881 insertions(+), 2118 deletions(-) -- 1.7.11 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel