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

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

diff --git a/drivers/staging/comedi/drivers/dt2801.c b/drivers/staging/comedi/drivers/dt2801.c
index 38918a1198aa83cfbcc717f69be05c074b9bd7aa..e0e7beab7274b255c79e079fa94a5e190b2a13f6 100644 (file)
--- a/drivers/staging/comedi/drivers/dt2801.c
+++ b/drivers/staging/comedi/drivers/dt2801.c
@@ -551,19 +551,32 @@ static int dt2801_dio_insn_bits(struct comedi_device *dev,
 
 static int dt2801_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)
 {
-       int ret;
+       int which = 0;
 
-       ret = comedi_dio_insn_config(dev, s, insn, data, 0xff);
-       if (ret)
-               return ret;
+       if (s == &dev->subdevices[3])
+               which = 1;
 
-       dt2801_writecmd(dev, s->io_bits ? DT_C_SET_DIGOUT : DT_C_SET_DIGIN);
-       dt2801_writedata(dev, (s == &dev->subdevices[3]) ? 1 : 0);
+       /* configure */
+       switch (data[0]) {
+       case INSN_CONFIG_DIO_OUTPUT:
+               s->io_bits = 0xff;
+               dt2801_writecmd(dev, DT_C_SET_DIGOUT);
+               break;
+       case INSN_CONFIG_DIO_INPUT:
+               s->io_bits = 0;
+               dt2801_writecmd(dev, DT_C_SET_DIGIN);
+               break;
+       case INSN_CONFIG_DIO_QUERY:
+               data[1] = s->io_bits ? COMEDI_OUTPUT : COMEDI_INPUT;
+               return insn->n;
+       default:
+               return -EINVAL;
+       }
+       dt2801_writedata(dev, which);
 
-       return insn->n;
+       return 1;
 }
 
 /*