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

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

staging: comedi: pcl816: all board types have 16 analog inputs 



All the boards supported by this driver have 16 analog input channels.

Remove the 'n_aichan' member from the boardinfo and refactor pcl816_attach().

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 78da4c56

drivers/staging/comedi/drivers/pcl816.c

+14 −21
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ static const struct comedi_lrange range_pcl816 = { 
struct pcl816_board {

	const char *name;

	int n_ranges;

	int n_aichan;

	unsigned int ai_ns_min;

	int n_aochan;

	const struct comedi_lrange *ai_range_type;
@@ -108,7 +107,6 @@ static const struct pcl816_board boardtypes[] = { 
	{

		.name		= "pcl816",

		.n_ranges	= 8,

		.n_aichan	= 16,

		.ai_ns_min	= 10000,

		.n_aochan	= 1,

		.ai_range_type	= &range_pcl816,
@@ -120,7 +118,6 @@ static const struct pcl816_board boardtypes[] = { 
	}, {

		.name		= "pcl814b",

		.n_ranges	= 8,

		.n_aichan	= 16,

		.ai_ns_min	= 10000,

		.n_aochan	= 1,

		.ai_range_type	= &range_pcl816,
@@ -927,10 +924,9 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
		return ret;



	s = &dev->subdevices[0];

	if (board->n_aichan > 0) {

	s->type		= COMEDI_SUBD_AI;

	s->subdev_flags	= SDF_CMD_READ | SDF_DIFF;

		s->n_chan = board->n_aichan;

	s->n_chan	= 16;

	s->maxdata	= board->ai_maxdata;

	s->range_table	= board->ai_range_type;

	s->insn_read	= pcl816_ai_insn_read;
@@ -943,9 +939,6 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
		s->poll		= pcl816_ai_poll;

		s->cancel	= pcl816_ai_cancel;

	}

	} else {

		s->type = COMEDI_SUBD_UNUSED;

	}



#if 0

	subdevs[1] = COMEDI_SUBD_AO;