Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: comedi: icp_multi: remove n_aochan from boardinfo 



There is only one board type supported by this driver and the
number of analog output channels is constant. Remove the
boardinfo for it and just open-code the value.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 48f31251

drivers/staging/comedi/drivers/icp_multi.c

+28 −33
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ struct boardtype { 
	char cardtype;		/*  0=ICP Multi */

	int n_aichan;		/*  num of A/D chans */

	int n_aichand;		/*  num of A/D chans in diff mode */

	int n_aochan;		/*  num of D/A chans */

	int ai_maxdata;		/*  resolution of A/D */

	int ao_maxdata;		/*  resolution of D/A */

	const struct comedi_lrange *rangelist_ai;	/*  rangelist for A/D */
@@ -685,9 +684,8 @@ static int icp_multi_reset(struct comedi_device *dev) 
	writew(0, devpriv->io_addr + ICP_MULTI_INT_EN);

	writew(0x00ff, devpriv->io_addr + ICP_MULTI_INT_STAT);



	if (this_board->n_aochan)

	/* Set DACs to 0..5V range and 0V output */

		for (i = 0; i < this_board->n_aochan; i++) {

	for (i = 0; i < 4; i++) {

		devpriv->DacCmdStatus &= 0xfcce;



		/*  Set channel number */
@@ -706,6 +704,7 @@ static int icp_multi_reset(struct comedi_device *dev) 
		/*  Delay to allow DAC time to recover */

		udelay(1);

	}



	/* Digital outputs to 0 */

	writew(0, devpriv->io_addr + ICP_MULTI_DO);
@@ -772,7 +771,6 @@ static int icp_multi_attach(struct comedi_device *dev, 
	n_subdevices = 0;

	if (this_board->n_aichan)

		n_subdevices++;

	if (this_board->n_aochan)

	n_subdevices++;

	n_subdevices++;

	n_subdevices++;
@@ -820,18 +818,16 @@ static int icp_multi_attach(struct comedi_device *dev, 
		subdev++;

	}



	if (this_board->n_aochan) {

	s = &dev->subdevices[subdev];

	s->type = COMEDI_SUBD_AO;

	s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;

		s->n_chan = this_board->n_aochan;

	s->n_chan = 4;

	s->maxdata = this_board->ao_maxdata;

		s->len_chanlist = this_board->n_aochan;

	s->len_chanlist = 4;

	s->range_table = &range_analog;

	s->insn_write = icp_multi_insn_write_ao;

	s->insn_read = icp_multi_insn_read_ao;

	subdev++;

	}



	s = &dev->subdevices[subdev];

	s->type = COMEDI_SUBD_DI;
@@ -896,7 +892,6 @@ static const struct boardtype boardtypes[] = { 
		.cardtype	= TYPE_ICP_MULTI,

		.n_aichan	= 16,

		.n_aichand	= 8,

		.n_aochan	= 4,

		.ai_maxdata	= 0x0fff,

		.ao_maxdata	= 0x0fff,

		.rangelist_ai	= &range_analog,