diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2012-09-21 12:05:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-26 09:35:50 -0700 |
| commit | 08351926d23577711c48ef63168b1255702c6c77 (patch) | |
| tree | d625328ae1e625fcdbc9884fc5385bd76731f02e /drivers/staging/comedi/drivers/ni_daq_700.c | |
| parent | 9d54814f31ea4f577db2b2d49c00b2f9bcb0c124 (diff) | |
staging: comedi: ni_daq_700: rename functions for DIO subdevice
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_daq_700.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_700.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index 53bce6c81cf4..231846351192 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -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]; @@ -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) { @@ -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; |