[PATCH 03/15] staging: comedi: comedi_parport: tidy up parport_insn_a()

[H Hartley Sweeten]

Rename this function to better describe it's use.

Use comedi_dio_insn_bits() to handle the boilerplate code to update
the subdevice s->state.

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/comedi_parport.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c
index 5565a99..6880b69 100644
--- a/drivers/staging/comedi/drivers/comedi_parport.c
+++ b/drivers/staging/comedi/drivers/comedi_parport.c
@@ -96,15 +96,13 @@ struct parport_private {
 	int enable_irq;
 };
 
-static int parport_insn_a(struct comedi_device *dev, struct comedi_subdevice *s,
-			  struct comedi_insn *insn, unsigned int *data)
+static int parport_data_reg_insn_bits(struct comedi_device *dev,
+				      struct comedi_subdevice *s,
+				      struct comedi_insn *insn,
+				      unsigned int *data)
 {
-	if (data[0]) {
-		s->state &= ~data[0];
-		s->state |= (data[0] & data[1]);
-
+	if (comedi_dio_insn_bits(dev, s, insn, data))
 		outb(s->state, dev->iobase + PARPORT_DATA_REG);
-	}
 
 	data[1] = inb(dev->iobase + PARPORT_DATA_REG);
 
@@ -289,7 +287,7 @@ static int parport_attach(struct comedi_device *dev,
 	s->n_chan = 8;
 	s->maxdata = 1;
 	s->range_table = &range_digital;
-	s->insn_bits = parport_insn_a;
+	s->insn_bits = parport_data_reg_insn_bits;
 	s->insn_config = parport_insn_config_a;
 
 	s = &dev->subdevices[1];
-- 
1.8.3.2