Revert "staging: comedi: drivers: use comedi_dio_insn_config() for complex cases"

[firefly-linux-kernel-4.4.55.git] / drivers / staging / comedi / drivers / ni_at_ao.c

diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c
index b9122fd835e1e714cec811c43d2c6c1a51675e9e..0025496bc643caf04b2c74374f65c4e642de3592 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_at_ao.c
+++ b/drivers/staging/comedi/drivers/ni_at_ao.c
@@ -248,35 +248,42 @@ static int atao_dio_insn_bits(struct comedi_device *dev,
 
 static int atao_dio_insn_config(struct comedi_device *dev,
                                struct comedi_subdevice *s,
-                               struct comedi_insn *insn,
-                               unsigned int *data)
+                               struct comedi_insn *insn, unsigned int *data)
 {
        struct atao_private *devpriv = dev->private;
-       unsigned int chan = CR_CHAN(insn->chanspec);
-       unsigned int mask;
-       int ret;
-
-       if (chan < 4)
-               mask = 0x0f;
-       else
-               mask = 0xf0;
-
-       ret = comedi_dio_insn_config(dev, s, insn, data, mask);
-       if (ret)
-               return ret;
-
-       if (s->io_bits & 0x0f)
-               devpriv->cfg3 |= DOUTEN1;
-       else
-               devpriv->cfg3 &= ~DOUTEN1;
-       if (s->io_bits & 0xf0)
-               devpriv->cfg3 |= DOUTEN2;
-       else
-               devpriv->cfg3 &= ~DOUTEN2;
+       int chan = CR_CHAN(insn->chanspec);
+       unsigned int mask, bit;
+
+       /* The input or output configuration of each digital line is
+        * configured by a special insn_config instruction.  chanspec
+        * contains the channel to be changed, and data[0] contains the
+        * value COMEDI_INPUT or COMEDI_OUTPUT. */
+
+       mask = (chan < 4) ? 0x0f : 0xf0;
+       bit = (chan < 4) ? DOUTEN1 : DOUTEN2;
+
+       switch (data[0]) {
+       case INSN_CONFIG_DIO_OUTPUT:
+               s->io_bits |= mask;
+               devpriv->cfg3 |= bit;
+               break;
+       case INSN_CONFIG_DIO_INPUT:
+               s->io_bits &= ~mask;
+               devpriv->cfg3 &= ~bit;
+               break;
+       case INSN_CONFIG_DIO_QUERY:
+               data[1] =
+                   (s->io_bits & (1 << chan)) ? COMEDI_OUTPUT : COMEDI_INPUT;
+               return insn->n;
+               break;
+       default:
+               return -EINVAL;
+               break;
+       }
 
        outw(devpriv->cfg3, dev->iobase + ATAO_CFG3);
 
-       return insn->n;
+       return 1;
 }
 
 /*