[PATCH 01/17] staging: comedi: adl_pci9118: move digitial output (*insn_bits) function
H Hartley Sweeten
hsweeten at visionengravers.com
Fri Sep 5 16:25:35 UTC 2014
For aesthetics, move the digital outputs (*insn_bits) function so it
is not located in the middle of the analog input functions. Also,
rename it for consistency.
Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
drivers/staging/comedi/drivers/adl_pci9118.c | 40 ++++++++++++++--------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 03ca818..a9fd343 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -566,25 +566,6 @@ static int pci9118_insn_bits_di(struct comedi_device *dev,
return insn->n;
}
-static int pci9118_insn_bits_do(struct comedi_device *dev,
- struct comedi_subdevice *s,
- struct comedi_insn *insn,
- unsigned int *data)
-{
- /*
- * The digital outputs are set with the same register that
- * the digital inputs and outputs are read from. But the
- * outputs are set with bits [3:0] so we can simply write
- * the s->state to set them.
- */
- if (comedi_dio_update_state(s, data))
- outl(s->state, dev->iobase + PCI9118_DIO_REG);
-
- data[1] = s->state;
-
- return insn->n;
-}
-
static void interrupt_pci9118_ai_mode4_switch(struct comedi_device *dev)
{
struct pci9118_private *devpriv = dev->private;
@@ -1667,6 +1648,25 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
return ret;
}
+static int pci9118_do_insn_bits(struct comedi_device *dev,
+ struct comedi_subdevice *s,
+ struct comedi_insn *insn,
+ unsigned int *data)
+{
+ /*
+ * The digital outputs are set with the same register that
+ * the digital inputs and outputs are read from. But the
+ * outputs are set with bits [3:0] so we can simply write
+ * the s->state to set them.
+ */
+ if (comedi_dio_update_state(s, data))
+ outl(s->state, dev->iobase + PCI9118_DIO_REG);
+
+ data[1] = s->state;
+
+ return insn->n;
+}
+
static int pci9118_reset(struct comedi_device *dev)
{
struct pci9118_private *devpriv = dev->private;
@@ -1905,7 +1905,7 @@ static int pci9118_common_attach(struct comedi_device *dev, int disable_irq,
s->n_chan = 4;
s->maxdata = 1;
s->range_table = &range_digital;
- s->insn_bits = pci9118_insn_bits_do;
+ s->insn_bits = pci9118_do_insn_bits;
devpriv->ai_maskharderr = 0x10a;
/* default measure crash condition */
--
2.0.3
More information about the devel
mailing list