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

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

staging: comedi: das800: tidy up subdevice init 



For aesthetic reasons, rename some of the subdevice functions
to help with greps and add some whitespace to the subdevice init.

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 f05ffb6e

drivers/staging/comedi/drivers/das800.c

+29 −26
Original line number Diff line number Diff line
@@ -577,8 +577,9 @@ static irqreturn_t das800_interrupt(int irq, void *d) 
	return IRQ_HANDLED;

}



static int das800_ai_rinsn(struct comedi_device *dev,

			   struct comedi_subdevice *s, struct comedi_insn *insn,

static int das800_ai_insn_read(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       struct comedi_insn *insn,

			       unsigned int *data)

{

	const struct das800_board *thisboard = comedi_board(dev);
@@ -633,8 +634,9 @@ static int das800_ai_rinsn(struct comedi_device *dev, 
	return n;

}



static int das800_di_rbits(struct comedi_device *dev,

			   struct comedi_subdevice *s, struct comedi_insn *insn,

static int das800_di_insn_bits(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       struct comedi_insn *insn,

			       unsigned int *data)

{

	unsigned int bits;
@@ -647,8 +649,9 @@ static int das800_di_rbits(struct comedi_device *dev, 
	return insn->n;

}



static int das800_do_wbits(struct comedi_device *dev,

			   struct comedi_subdevice *s, struct comedi_insn *insn,

static int das800_do_insn_bits(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       struct comedi_insn *insn,

			       unsigned int *data)

{

	struct das800_private *devpriv = dev->private;
@@ -750,7 +753,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	if (ret)

		return ret;



	/* analog input subdevice */

	/* Analog Input subdevice */

	s = &dev->subdevices[0];

	dev->read_subdev = s;

	s->type		= COMEDI_SUBD_AI;
@@ -758,7 +761,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	s->n_chan	= 8;

	s->maxdata	= (1 << thisboard->resolution) - 1;

	s->range_table	= thisboard->ai_range;

	s->insn_read	= das800_ai_rinsn;

	s->insn_read	= das800_ai_insn_read;

	if (dev->irq) {

		s->subdev_flags	|= SDF_CMD_READ;

		s->len_chanlist	= 8;
@@ -767,23 +770,23 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
		s->cancel	= das800_cancel;

	}



	/* di */

	/* Digital Input subdevice */

	s = &dev->subdevices[1];

	s->type		= COMEDI_SUBD_DI;

	s->subdev_flags	= SDF_READABLE;

	s->n_chan	= 3;

	s->maxdata	= 1;

	s->range_table	= &range_digital;

	s->insn_bits = das800_di_rbits;

	s->insn_bits	= das800_di_insn_bits;



	/* do */

	/* Digital Output subdevice */

	s = &dev->subdevices[2];

	s->type		= COMEDI_SUBD_DO;

	s->subdev_flags	= SDF_WRITABLE | SDF_READABLE;

	s->n_chan	= 4;

	s->maxdata	= 1;

	s->range_table	= &range_digital;

	s->insn_bits = das800_do_wbits;

	s->insn_bits	= das800_do_insn_bits;



	disable_das800(dev);