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

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

staging: comedi: icp_multi: remove n_ctrs from boardinfo 



There is only one board type supported by this driver and the
number of counter 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 88886662

drivers/staging/comedi/drivers/icp_multi.c

+11 −16
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ struct boardtype { 
	int n_aochan;		/*  num of D/A chans */

	int n_dichan;		/*  num of DI chans */

	int n_dochan;		/*  num of DO chans */

	int n_ctrs;		/*  num of counters */

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

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

	const struct comedi_lrange *rangelist_ai;	/*  rangelist for A/D */
@@ -781,7 +780,6 @@ static int icp_multi_attach(struct comedi_device *dev, 
		n_subdevices++;

	if (this_board->n_dochan)

		n_subdevices++;

	if (this_board->n_ctrs)

	n_subdevices++;



	ret = comedi_alloc_subdevices(dev, n_subdevices);
@@ -866,18 +864,16 @@ static int icp_multi_attach(struct comedi_device *dev, 
		subdev++;

	}



	if (this_board->n_ctrs) {

	s = &dev->subdevices[subdev];

	s->type = COMEDI_SUBD_COUNTER;

	s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;

		s->n_chan = this_board->n_ctrs;

	s->n_chan = 4;

	s->maxdata = 0xffff;

		s->len_chanlist = this_board->n_ctrs;

	s->len_chanlist = 4;

	s->state = 0;

	s->insn_read = icp_multi_insn_read_ctr;

	s->insn_write = icp_multi_insn_write_ctr;

	subdev++;

	}



	devpriv->valid = 1;
@@ -911,7 +907,6 @@ static const struct boardtype boardtypes[] = { 
		.n_aochan	= 4,

		.n_dichan	= 16,

		.n_dochan	= 8,

		.n_ctrs		= 4,

		.ai_maxdata	= 0x0fff,

		.ao_maxdata	= 0x0fff,

		.rangelist_ai	= &range_analog,