Commit e0025918 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ef49d832

drivers/staging/comedi/drivers/addi_apci_1500.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/drivers/addi_apci_3501.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/drivers/adv_pci1710.c

+2 −2
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ static int pci1710_auto_attach(struct comedi_device *dev, 
	if (this_board->n_dichan) {

		s = &dev->subdevices[subdev];

		s->type = COMEDI_SUBD_DI;

		s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;

		s->subdev_flags = SDF_READABLE;

		s->n_chan = this_board->n_dichan;

		s->maxdata = 1;

		s->len_chanlist = this_board->n_dichan;
@@ -1222,7 +1222,7 @@ static int pci1710_auto_attach(struct comedi_device *dev, 
	if (this_board->n_dochan) {

		s = &dev->subdevices[subdev];

		s->type = COMEDI_SUBD_DO;

		s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;

		s->subdev_flags = SDF_WRITABLE;

		s->n_chan = this_board->n_dochan;

		s->maxdata = 1;

		s->len_chanlist = this_board->n_dochan;

drivers/staging/comedi/drivers/adv_pci_dio.c

+4 −4
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ static int pci1760_attach(struct comedi_device *dev) 


	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 = 8;

	s->maxdata = 1;

	s->len_chanlist = 8;
@@ -939,7 +939,7 @@ static int pci1760_attach(struct comedi_device *dev) 


	s = &dev->subdevices[1];

	s->type = COMEDI_SUBD_DO;

	s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;

	s->subdev_flags = SDF_WRITABLE;

	s->n_chan = 8;

	s->maxdata = 1;

	s->len_chanlist = 8;
@@ -978,7 +978,7 @@ static int pci_dio_add_di(struct comedi_device *dev, 
	const struct dio_boardtype *this_board = dev->board_ptr;



	s->type = COMEDI_SUBD_DI;

	s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON | d->specflags;

	s->subdev_flags = SDF_READABLE | d->specflags;

	if (d->chans > 16)

		s->subdev_flags |= SDF_LSAMPL;

	s->n_chan = d->chans;
@@ -1008,7 +1008,7 @@ static int pci_dio_add_do(struct comedi_device *dev, 
	const struct dio_boardtype *this_board = dev->board_ptr;



	s->type = COMEDI_SUBD_DO;

	s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;

	s->subdev_flags = SDF_WRITABLE;

	if (d->chans > 16)

		s->subdev_flags |= SDF_LSAMPL;

	s->n_chan = d->chans;

drivers/staging/comedi/drivers/dyna_pci10xx.c

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int dyna_pci10xx_auto_attach(struct comedi_device *dev, 
	/* digital input */

	s = &dev->subdevices[2];

	s->type = COMEDI_SUBD_DI;

	s->subdev_flags = SDF_READABLE | SDF_GROUND;

	s->subdev_flags = SDF_READABLE;

	s->n_chan = 16;

	s->maxdata = 1;

	s->range_table = &range_digital;
@@ -228,7 +228,7 @@ static int dyna_pci10xx_auto_attach(struct comedi_device *dev, 
	/* digital output */

	s = &dev->subdevices[3];

	s->type = COMEDI_SUBD_DO;

	s->subdev_flags = SDF_WRITABLE | SDF_GROUND;

	s->subdev_flags = SDF_WRITABLE;

	s->n_chan = 16;

	s->maxdata = 1;

	s->range_table = &range_digital;

CRA Git | Maintained and supported by SUSTech CRA and CCSE