Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c921337 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: comedi_parport: tidy up parport_insn_a() 



Rename this function to better describe it's use.

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

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9f1a0909

drivers/staging/comedi/drivers/comedi_parport.c

+6 −8
Original line number Diff line number Diff line
@@ -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_update_state(s, 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];