aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2012-09-21 07:05:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-26 12:35:50 -0400
commit08351926d23577711c48ef63168b1255702c6c77 (patch)
treed625328ae1e625fcdbc9884fc5385bd76731f02e
parent9d54814f31ea4f577db2b2d49c00b2f9bcb0c124 (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>
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_700.c12
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 {
58#define DIO_W 0x04 58#define DIO_W 0x04
59#define DIO_R 0x05 59#define DIO_R 0x05
60 60
61static int subdev_700_insn(struct comedi_device *dev, 61static int daq700_dio_insn_bits(struct comedi_device *dev,
62 struct comedi_subdevice *s, struct comedi_insn *insn, 62 struct comedi_subdevice *s,
63 unsigned int *data) 63 struct comedi_insn *insn, unsigned int *data)
64{ 64{
65 if (data[0]) { 65 if (data[0]) {
66 s->state &= ~data[0]; 66 s->state &= ~data[0];
@@ -76,7 +76,7 @@ static int subdev_700_insn(struct comedi_device *dev,
76 return insn->n; 76 return insn->n;
77} 77}
78 78
79static int subdev_700_insn_config(struct comedi_device *dev, 79static int daq700_dio_insn_config(struct comedi_device *dev,
80 struct comedi_subdevice *s, 80 struct comedi_subdevice *s,
81 struct comedi_insn *insn, unsigned int *data) 81 struct comedi_insn *insn, unsigned int *data)
82{ 82{
@@ -127,8 +127,8 @@ static int daq700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
127 s->n_chan = 16; 127 s->n_chan = 16;
128 s->range_table = &range_digital; 128 s->range_table = &range_digital;
129 s->maxdata = 1; 129 s->maxdata = 1;
130 s->insn_bits = subdev_700_insn; 130 s->insn_bits = daq700_dio_insn_bits;
131 s->insn_config = subdev_700_insn_config; 131 s->insn_config = daq700_dio_insn_config;
132 132
133 s->state = 0; 133 s->state = 0;
134 s->io_bits = 0x00ff; 134 s->io_bits = 0x00ff;