Skip to content

Commit

Permalink
staging: comedi: acl7225b: rename the (*insn_bits) subdevice functions
Browse files Browse the repository at this point in the history
For aesthetic reasons, and to help with greps, rename the (*insn_bits)
functions in this driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 9, 2013
1 parent 27b88d6 commit cd8de2e
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions drivers/staging/comedi/drivers/acl7225b.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ static const struct acl7225b_boardinfo acl7225b_boards[] = {
},
};

static int acl7225b_do_insn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
static int acl7225b_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
if (data[0]) {
s->state &= ~data[0];
Expand All @@ -54,9 +55,10 @@ static int acl7225b_do_insn(struct comedi_device *dev,
return insn->n;
}

static int acl7225b_di_insn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
static int acl7225b_di_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
data[1] = inb(dev->iobase + (unsigned long)s->private) |
(inb(dev->iobase + (unsigned long)s->private + 1) << 8);
Expand Down Expand Up @@ -87,7 +89,7 @@ static int acl7225b_attach(struct comedi_device *dev,
s->subdev_flags = SDF_WRITABLE;
s->maxdata = 1;
s->n_chan = 16;
s->insn_bits = acl7225b_do_insn;
s->insn_bits = acl7225b_do_insn_bits;
s->range_table = &range_digital;
s->private = (void *)ACL7225_RIO_LO;

Expand All @@ -97,7 +99,7 @@ static int acl7225b_attach(struct comedi_device *dev,
s->subdev_flags = SDF_READABLE;
s->maxdata = 1;
s->n_chan = 16;
s->insn_bits = acl7225b_di_insn;
s->insn_bits = acl7225b_di_insn_bits;
s->range_table = &range_digital;
s->private = (void *)ACL7225_RIO_LO;

Expand All @@ -107,7 +109,7 @@ static int acl7225b_attach(struct comedi_device *dev,
s->subdev_flags = SDF_READABLE;
s->maxdata = 1;
s->n_chan = 16;
s->insn_bits = acl7225b_di_insn;
s->insn_bits = acl7225b_di_insn_bits;
s->range_table = &range_digital;
s->private = (void *)ACL7225_DI_LO;

Expand Down

0 comments on commit cd8de2e

Please sign in to comment.