diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-08-30 18:45:53 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-17 14:47:42 (GMT) |
| commit | 6e2dbe3c6c7736592310b80bccf7c5c09614e72f (patch) | |
| tree | 89a4abed693685903637d5cffbd4c9621bb6f768 | |
| parent | 9f2843d17e3ca7aac99f5d77d690a80f10878a4a (diff) | |
| download | linux-fsl-qoriq-6e2dbe3c6c7736592310b80bccf7c5c09614e72f.tar.xz | |
staging: comedi: comedi_parport: tidy up parport_insn_b()
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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/comedi_parport.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c index 0e0cc75..8394b7e 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; |