From: H Hartley Sweeten Date: Fri, 30 Aug 2013 18:45:53 +0000 (-0700) Subject: staging: comedi: comedi_parport: tidy up parport_insn_b() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6e2dbe3c6c7736592310b80bccf7c5c09614e72f;p=linux-beck.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c index 0e0cc75d03e7..8394b7ea894a 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;