staging: comedi: das08: rename das08_di_rbits() & das08jr_di_rbits()
`das08_di_rbits()` and `das08jr_di_rbits()` are handlers for the Comedi `INSN_BITS` instruction for the digital input subdevice on "non-JR" and "JR" boards, respectively. Rename them to `das08_di_insn_bits()` and `das08jr_di_insn_bits()` respectively for consistency. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
c224a91957
Коммит
9f05914d0c
|
@ -242,8 +242,9 @@ static int das08_ai_insn_read(struct comedi_device *dev,
|
|||
return n;
|
||||
}
|
||||
|
||||
static int das08_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
|
||||
struct comedi_insn *insn, unsigned int *data)
|
||||
static int das08_di_insn_bits(struct comedi_device *dev,
|
||||
struct comedi_subdevice *s,
|
||||
struct comedi_insn *insn, unsigned int *data)
|
||||
{
|
||||
data[0] = 0;
|
||||
data[1] = DAS08_STATUS_DI(inb(dev->iobase + DAS08_STATUS_REG));
|
||||
|
@ -272,9 +273,9 @@ static int das08_do_wbits(struct comedi_device *dev,
|
|||
return insn->n;
|
||||
}
|
||||
|
||||
static int das08jr_di_rbits(struct comedi_device *dev,
|
||||
struct comedi_subdevice *s,
|
||||
struct comedi_insn *insn, unsigned int *data)
|
||||
static int das08jr_di_insn_bits(struct comedi_device *dev,
|
||||
struct comedi_subdevice *s,
|
||||
struct comedi_insn *insn, unsigned int *data)
|
||||
{
|
||||
data[0] = 0;
|
||||
data[1] = inb(dev->iobase + DAS08JR_DI_REG);
|
||||
|
@ -402,8 +403,8 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase)
|
|||
s->n_chan = thisboard->di_nchan;
|
||||
s->maxdata = 1;
|
||||
s->range_table = &range_digital;
|
||||
s->insn_bits =
|
||||
thisboard->is_jr ? das08jr_di_rbits : das08_di_rbits;
|
||||
s->insn_bits = thisboard->is_jr ? das08jr_di_insn_bits :
|
||||
das08_di_insn_bits;
|
||||
} else {
|
||||
s->type = COMEDI_SUBD_UNUSED;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче