]> Pileus Git - ~andy/linux/commitdiff
staging: comedi: ni_daq_700: rename functions for DIO subdevice
authorIan Abbott <abbotti@mev.co.uk>
Fri, 21 Sep 2012 11:05:46 +0000 (12:05 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Sep 2012 16:35:50 +0000 (09:35 -0700)
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>
drivers/staging/comedi/drivers/ni_daq_700.c

index 53bce6c81cf43a84a47d8e51336e4bf163e88db3..2318463511920bf020e173b68be5a0fe5e60bdfb 100644 (file)
@@ -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;