From: H Hartley Sweeten Date: Tue, 3 May 2016 19:29:55 +0000 (-0700) Subject: staging: comedi: das16m1: tidy up digital output subdevice init X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=702907d7ab040eb9cf9d311878aad4bd64362ef0;p=linux-beck.git staging: comedi: das16m1: tidy up digital output subdevice init Add some whitespace to the subdevice init and rename the support function. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c index 538544b4ed1c..cb5cd5e5b044 100644 --- a/drivers/staging/comedi/drivers/das16m1.c +++ b/drivers/staging/comedi/drivers/das16m1.c @@ -357,10 +357,10 @@ static int das16m1_di_insn_bits(struct comedi_device *dev, return insn->n; } -static int das16m1_do_wbits(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, - unsigned int *data) +static int das16m1_do_insn_bits(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { if (comedi_dio_update_state(s, data)) outb(s->state, dev->iobase + DAS16M1_DO_REG); @@ -580,14 +580,14 @@ static int das16m1_attach(struct comedi_device *dev, s->range_table = &range_digital; s->insn_bits = das16m1_di_insn_bits; + /* Digital Output subdevice */ s = &dev->subdevices[2]; - /* do */ - s->type = COMEDI_SUBD_DO; - s->subdev_flags = SDF_WRITABLE; - s->n_chan = 4; - s->maxdata = 1; - s->range_table = &range_digital; - s->insn_bits = das16m1_do_wbits; + s->type = COMEDI_SUBD_DO; + s->subdev_flags = SDF_WRITABLE; + s->n_chan = 4; + s->maxdata = 1; + s->range_table = &range_digital; + s->insn_bits = das16m1_do_insn_bits; s = &dev->subdevices[3]; /* 8255 */