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

Commit 3919c3d5 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: das08: rename das08_do_wbits() & das08jr_do_wbits() 



`das08_do_wbits()` and `das08jr_do_wbits()` are handlers for the Comedi
`INSN_BITS` instruction for the digital output subdevice on "non-JR" and
"JR" boards, respectively.  Rename them to `das08_do_insn_bits()` and
`das08jr_do_insn_bits()` respectively for consistency.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9f05914d

drivers/staging/comedi/drivers/das08.c

+8 −10
Original line number Diff line number Diff line
@@ -252,10 +252,9 @@ static int das08_di_insn_bits(struct comedi_device *dev, 
	return insn->n;

}



static int das08_do_wbits(struct comedi_device *dev,

static int das08_do_insn_bits(struct comedi_device *dev,

			      struct comedi_subdevice *s,

			  struct comedi_insn *insn,

			  unsigned int *data)

			      struct comedi_insn *insn, unsigned int *data)

{

	struct das08_private_struct *devpriv = dev->private;
@@ -283,10 +282,9 @@ static int das08jr_di_insn_bits(struct comedi_device *dev, 
	return insn->n;

}



static int das08jr_do_wbits(struct comedi_device *dev,

static int das08jr_do_insn_bits(struct comedi_device *dev,

				struct comedi_subdevice *s,

			    struct comedi_insn *insn,

			    unsigned int *data)

				struct comedi_insn *insn, unsigned int *data)

{

	if (comedi_dio_update_state(s, data))

		outb(s->state, dev->iobase + DAS08JR_DO_REG);
@@ -417,8 +415,8 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase) 
		s->n_chan = thisboard->do_nchan;

		s->maxdata = 1;

		s->range_table = &range_digital;

		s->insn_bits =

			thisboard->is_jr ? das08jr_do_wbits : das08_do_wbits;

		s->insn_bits = thisboard->is_jr ? das08jr_do_insn_bits :

			       das08_do_insn_bits;

	} else {

		s->type = COMEDI_SUBD_UNUSED;

	}