The "ni_labpc" module is a Comedi driver for the National Instruments Lab-PC series of ISA data acquistion boards, and also provides common code for the "ni_labpc_pci" and "ni_labpci_cs" modules (for PCI boards and PCMCIA cards). Split out the common code into a new module "ni_labpc_common", leaving the driver for the ISA boards in the existing "ni_labpc" module. This removes the C preprocessor conditional directives from the resulting ".c" files. The split is done in patch 6. The preceding patches are just to tidy up the source a bit before the split. Please ignore the checkpatch warning from patch 6: WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? 1) staging: comedi: ni_labpc: remove unnecessary braces in labpc_common_attach() 2) staging: comedi: ni_labpc: use braces on all arms of `if` statement 3) staging: comedi: ni_labpc: Alignment should match open parenthesis 4) staging: comedi: ni_labpc: Logical continuations should be on the previous line 5) staging: comedi: ni_labpc: break lines after operators 6) staging: comedi: ni_labpc: split common code to ni_labpc_common drivers/staging/comedi/drivers/Makefile | 3 +- drivers/staging/comedi/drivers/ni_labpc.c | 1364 +-------------------- drivers/staging/comedi/drivers/ni_labpc_common.c | 1387 ++++++++++++++++++++++ 3 files changed, 1390 insertions(+), 1364 deletions(-) _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel