[PATCH 12/22] staging: comedi: adv_pci1710: rename pci171x_d[io]_insn_bits

[H Hartley Sweeten]

Rename these functions so they have namespace associated with the driver.

For aesthetics, move the functions so they are not located in the middle
of the analog input/output support functions.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/adv_pci1710.c | 50 ++++++++++++++--------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c 
b/drivers/staging/comedi/drivers/adv_pci1710.c
index 6d45bb3..6952d30 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -387,29 +387,6 @@ static int pci171x_ao_insn_write(struct comedi_device *dev,
        return insn->n;
 }
 
-static int pci171x_di_insn_bits(struct comedi_device *dev,
-                               struct comedi_subdevice *s,
-                               struct comedi_insn *insn,
-                               unsigned int *data)
-{
-       data[1] = inw(dev->iobase + PCI171X_DI_REG);
-
-       return insn->n;
-}
-
-static int pci171x_do_insn_bits(struct comedi_device *dev,
-                               struct comedi_subdevice *s,
-                               struct comedi_insn *insn,
-                               unsigned int *data)
-{
-       if (comedi_dio_update_state(s, data))
-               outw(s->state, dev->iobase + PCI171X_DO_REG);
-
-       data[1] = s->state;
-
-       return insn->n;
-}
-
 static int pci171x_ai_cancel(struct comedi_device *dev,
                             struct comedi_subdevice *s)
 {
@@ -668,6 +645,29 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
        return 0;
 }
 
+static int pci1710_di_insn_bits(struct comedi_device *dev,
+                               struct comedi_subdevice *s,
+                               struct comedi_insn *insn,
+                               unsigned int *data)
+{
+       data[1] = inw(dev->iobase + PCI171X_DI_REG);
+
+       return insn->n;
+}
+
+static int pci1710_do_insn_bits(struct comedi_device *dev,
+                               struct comedi_subdevice *s,
+                               struct comedi_insn *insn,
+                               unsigned int *data)
+{
+       if (comedi_dio_update_state(s, data))
+               outw(s->state, dev->iobase + PCI171X_DO_REG);
+
+       data[1] = s->state;
+
+       return insn->n;
+}
+
 static int pci1710_counter_insn_config(struct comedi_device *dev,
                                       struct comedi_subdevice *s,
                                       struct comedi_insn *insn,
@@ -834,7 +834,7 @@ static int pci1710_auto_attach(struct comedi_device *dev,
                s->n_chan       = 16;
                s->maxdata      = 1;
                s->range_table  = &range_digital;
-               s->insn_bits    = pci171x_di_insn_bits;
+               s->insn_bits    = pci1710_di_insn_bits;
                subdev++;
 
                s = &dev->subdevices[subdev];
@@ -843,7 +843,7 @@ static int pci1710_auto_attach(struct comedi_device *dev,
                s->n_chan       = 16;
                s->maxdata      = 1;
                s->range_table  = &range_digital;
-               s->insn_bits    = pci171x_do_insn_bits;
+               s->insn_bits    = pci1710_do_insn_bits;
                subdev++;
        }
 
-- 
2.5.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel