Commit cffd83b6 authored by Chase Southwood's avatar Chase Southwood Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_apci_1564: board has 32 digital inputs 



This board always has 32 digital inputs. Remove the test when
initializing the subdevice.

Also, since this board is the only one supported by this driver,
remove the boardinfo about the digital inputs and just use the
data directly in the subdevice init.

Signed-off-by: default avatarChase Southwood <chase.southwood@gmail.com>
Reviewed-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 6aa4f14c

drivers/staging/comedi/drivers/addi_apci_1564.c

+9 −17
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ static const struct addi_board apci1564_boardtypes[] = { 
		.i_Timer		= 1,

		.interrupt		= apci1564_interrupt,

		.reset			= apci1564_reset,

		.di_config		= apci1564_di_config,

		.di_bits		= apci1564_di_insn_bits,

		.do_config		= apci1564_do_config,

		.do_bits		= apci1564_do_insn_bits,

		.do_read		= apci1564_do_read,
@@ -115,21 +113,15 @@ static int apci1564_auto_attach(struct comedi_device *dev, 


	/*  Allocate and Initialise DI Subdevice Structures */

	s = &dev->subdevices[2];

	if (devpriv->s_EeParameters.i_NbrDiChannel) {

	s->type = COMEDI_SUBD_DI;

		s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;

		s->n_chan = devpriv->s_EeParameters.i_NbrDiChannel;

	s->subdev_flags = SDF_READABLE;

	s->n_chan = 32;

	s->maxdata = 1;

		s->len_chanlist =

			devpriv->s_EeParameters.i_NbrDiChannel;

	s->len_chanlist = 32;

	s->range_table = &range_digital;

		s->insn_config = this_board->di_config;

		s->insn_read = this_board->di_read;

		s->insn_write = this_board->di_write;

		s->insn_bits = this_board->di_bits;

	} else {

		s->type = COMEDI_SUBD_UNUSED;

	}

	s->insn_config = apci1564_di_config;

	s->insn_bits = apci1564_di_insn_bits;



	/*  Allocate and Initialise DO Subdevice Structures */

	s = &dev->subdevices[3];

	if (devpriv->s_EeParameters.i_NbrDoChannel) {