staging: comedi: drivers: remove inappropriate SDF_* flags from subdevices

The SDF_GROUND, SDF_COMMON, SDF_DIFF, and SDF_OTHER flags are only useful
with the analog input and output subdevices.

Remove these flags from the other subdevice types in the comedi drivers.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c
index d43129c..30b132c 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1500.c
@@ -54,7 +54,7 @@ static int apci1500_auto_attach(struct comedi_device *dev,
        /*  Allocate and Initialise DI Subdevice Structures */
        s = &dev->subdevices[0];
        s->type = COMEDI_SUBD_DI;
-       s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
+       s->subdev_flags = SDF_READABLE;
        s->n_chan = 16;
        s->maxdata = 1;
        s->range_table = &range_digital;
@@ -66,7 +66,7 @@ static int apci1500_auto_attach(struct comedi_device *dev,
        /*  Allocate and Initialise DO Subdevice Structures */
        s = &dev->subdevices[1];
        s->type = COMEDI_SUBD_DO;
-       s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
+       s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
        s->n_chan = 16;
        s->maxdata = 1;
        s->range_table = &range_digital;
@@ -77,7 +77,7 @@ static int apci1500_auto_attach(struct comedi_device *dev,
        /*  Allocate and Initialise Timer Subdevice Structures */
        s = &dev->subdevices[2];
        s->type = COMEDI_SUBD_TIMER;
-       s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan = 1;
        s->maxdata = 0;
        s->len_chanlist = 1;

diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index 992ac8d..7924523 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -392,7 +392,7 @@ static int apci3501_auto_attach(struct comedi_device *dev,
        /* Initialize the timer/watchdog subdevice */
        s = &dev->subdevices[3];
        s->type = COMEDI_SUBD_TIMER;
-       s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan = 1;
        s->maxdata = 0;
        s->len_chanlist = 1;

diff --cc drivers/staging/comedi/drivers/adv_pci1710.c
Simple merge

diff --cc drivers/staging/comedi/drivers/adv_pci_dio.c
Simple merge

diff --cc drivers/staging/comedi/drivers/dyna_pci10xx.c
Simple merge

diff --cc drivers/staging/comedi/drivers/icp_multi.c
Simple merge