Rename this function to better describe it's use.
Tidy it up to follow the normal comedi (*insn_bits) for DI subdevices.
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/comedi_parport.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/comedi/drivers/comedi_parport.c
b/drivers/staging/comedi/drivers/comedi_parport.c
index a0dbb32..04feec7 100644
--- a/drivers/staging/comedi/drivers/comedi_parport.c
+++ b/drivers/staging/comedi/drivers/comedi_parport.c
@@ -130,15 +130,12 @@ static int parport_data_reg_insn_config(struct
comedi_device *dev,
return insn->n;
}
-static int parport_insn_b(struct comedi_device *dev, struct comedi_subdevice
*s,
- struct comedi_insn *insn, unsigned int *data)
+static int parport_status_reg_insn_bits(struct comedi_device *dev,
+ struct comedi_subdevice *s,
+ struct comedi_insn *insn,
+ unsigned int *data)
{
- if (data[0]) {
- /* should writes be ignored? */
- /* anyone??? */
- }
-
- data[1] = (inb(dev->iobase + PARPORT_STATUS_REG) >> 3);
+ data[1] = inb(dev->iobase + PARPORT_STATUS_REG) >> 3;
return insn->n;
}
@@ -299,7 +296,7 @@ static int parport_attach(struct comedi_device *dev,
s->n_chan = 5;
s->maxdata = 1;
s->range_table = &range_digital;
- s->insn_bits = parport_insn_b;
+ s->insn_bits = parport_status_reg_insn_bits;
s = &dev->subdevices[2];
s->type = COMEDI_SUBD_DO;
--
1.8.3.2
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
