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

staging: comedi: addi_apci_3xxx: tidy up the digital in and out subdevice init 



For aesthetic reasons, add some whitespace to the initialization of the
digital input and output subdevices.

Fix the subdev_flags for both subdevices. The SDF_GROUND and SDF_COMMON
flags only apply to analog subdevices. Digital output subdevices do not
need the SDF_READABLE flag set.

Remove the initialization of s->io_bits. It only has meaning for
COMEDI_SUBD_DIO subdevices.

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 f1861cb0

drivers/staging/comedi/drivers/addi_apci_3xxx.c

+18 −19
Original line number Diff line number Diff line
@@ -565,29 +565,28 @@ static int apci3xxx_auto_attach(struct comedi_device *dev, 
	} else {

		s->type = COMEDI_SUBD_UNUSED;

	}

	/*  Allocate and Initialise DI Subdevice Structures */



	/* Digital Input subdevice */

	s = &dev->subdevices[2];

	if (board->has_dig_in) {

		s->type		= COMEDI_SUBD_DI;

		s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;

		s->subdev_flags	= SDF_READABLE;

		s->n_chan	= 4;

		s->maxdata	= 1;

		s->range_table	= &range_digital;

		s->io_bits = 0;	/* all bits input */

		s->insn_bits	= apci3xxx_di_insn_bits;

	} else {

		s->type		= COMEDI_SUBD_UNUSED;

	}

	/*  Allocate and Initialise DO Subdevice Structures */



	/* Digital Output subdevice */

	s = &dev->subdevices[3];

	if (board->has_dig_out) {

		s->type		= COMEDI_SUBD_DO;

		s->subdev_flags =

			SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;

		s->subdev_flags	= SDF_WRITEABLE;

		s->n_chan	= 4;

		s->maxdata	= 1;

		s->range_table	= &range_digital;

		s->io_bits = 0xf;	/* all bits output */

		s->insn_bits	= apci3xxx_do_insn_bits;

	} else {

		s->type		= COMEDI_SUBD_UNUSED;