Skip to content

Commit

Permalink
staging: comedi: ni_daq_700: rename functions for DIO subdevice
Browse files Browse the repository at this point in the history
Rename `subdev_700_insn()` to `daq700_dio_insn_bits()` and
`subdev_700_insn_config()` to `daq700_dio_insn_config()`.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Sep 26, 2012
1 parent 9d54814 commit 0835192
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/staging/comedi/drivers/ni_daq_700.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ struct daq700_board {
#define DIO_W 0x04
#define DIO_R 0x05

static int subdev_700_insn(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_insn *insn,
unsigned int *data)
static int daq700_dio_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 @@ -76,7 +76,7 @@ static int subdev_700_insn(struct comedi_device *dev,
return insn->n;
}

static int subdev_700_insn_config(struct comedi_device *dev,
static int daq700_dio_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
Expand Down Expand Up @@ -127,8 +127,8 @@ static int daq700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->n_chan = 16;
s->range_table = &range_digital;
s->maxdata = 1;
s->insn_bits = subdev_700_insn;
s->insn_config = subdev_700_insn_config;
s->insn_bits = daq700_dio_insn_bits;
s->insn_config = daq700_dio_insn_config;

s->state = 0;
s->io_bits = 0x00ff;
Expand Down

0 comments on commit 0835192

Please sign in to comment.