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

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

diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index cf5dd10eaf91daa71cb75ced4270c450d49d31de..dbc0678027ca79b879661d0c03501b14c4960987 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -686,28 +686,38 @@ static int apci3xxx_dio_insn_config(struct comedi_device *dev,
                                    unsigned int *data)
 {
        unsigned int chan = CR_CHAN(insn->chanspec);
-       unsigned int mask;
-       int ret;
+       unsigned int mask = 1 << chan;
+       unsigned int bits;
 
        /*
         * Port 0 (channels 0-7) are always inputs
         * Port 1 (channels 8-15) are always outputs
         * Port 2 (channels 16-23) are programmable i/o
+        *
+        * Changing any channel in port 2 changes the entire port.
         */
-       if (chan < 16) {
-               if (data[0] != INSN_CONFIG_DIO_QUERY)
-                       return -EINVAL;
-       } else {
-               /* changing any channel in port 2 changes the entire port */
-               mask = 0xff0000;
+       if (mask & 0xff0000)
+               bits = 0xff0000;
+       else
+               bits = 0;
+
+       switch (data[0]) {
+       case INSN_CONFIG_DIO_INPUT:
+               s->io_bits &= ~bits;
+               break;
+       case INSN_CONFIG_DIO_OUTPUT:
+               s->io_bits |= bits;
+               break;
+       case INSN_CONFIG_DIO_QUERY:
+               data[1] = (s->io_bits & bits) ? COMEDI_OUTPUT : COMEDI_INPUT;
+               return insn->n;
+       default:
+               return -EINVAL;
        }
 
-       ret = comedi_dio_insn_config(dev, s, insn, data, mask);
-       if (ret)
-               return ret;
-
        /* update port 2 configuration */
-       outl((s->io_bits >> 24) & 0xff, dev->iobase + 224);
+       if (bits)
+               outl((s->io_bits >> 24) & 0xff, dev->iobase + 224);
 
        return insn->n;
 }