diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-06-05 17:49:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-06 12:09:16 -0700 |
| commit | 293d567167cf1b1189efcb2f3e9b1c848b4f0a63 (patch) | |
| tree | b7e4be6fd26be7b91081fb8d7a046e709a8c9446 | |
| parent | 74f14a58b95cbc561a527ab14953504d0d9dc61d (diff) | |
| download | linux-293d567167cf1b1189efcb2f3e9b1c848b4f0a63.tar.gz linux-293d567167cf1b1189efcb2f3e9b1c848b4f0a63.tar.bz2 linux-293d567167cf1b1189efcb2f3e9b1c848b4f0a63.zip | |
staging: comedi: pcl730: tidy up pcl730_attach()
For aesthetic reasons, add some whitespace to the subdevice init
and reorder it a bit.
Remove the blank line printk at the end of the attach.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl730.c | 75 |
1 files changed, 37 insertions, 38 deletions
diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c index bde2e30857d2..082020cd82d1 100644 --- a/drivers/staging/comedi/drivers/pcl730.c +++ b/drivers/staging/comedi/drivers/pcl730.c @@ -78,7 +78,8 @@ static int pcl730_di_insn_bits(struct comedi_device *dev, return insn->n; } -static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it) +static int pcl730_attach(struct comedi_device *dev, + struct comedi_devconfig *it) { const struct pcl730_board *board = comedi_board(dev); struct comedi_subdevice *s; @@ -92,47 +93,45 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it) if (ret) return ret; + /* Isolated Digital Outputs */ s = &dev->subdevices[0]; - /* Isolated do */ - s->type = COMEDI_SUBD_DO; - s->subdev_flags = SDF_WRITABLE; - s->maxdata = 1; - s->n_chan = 16; - s->insn_bits = pcl730_do_insn_bits; - s->range_table = &range_digital; - s->private = (void *)PCL730_IDIO_LO; - + s->type = COMEDI_SUBD_DO; + s->subdev_flags = SDF_WRITABLE; + s->n_chan = 16; + s->maxdata = 1; + s->range_table = &range_digital; + s->insn_bits = pcl730_do_insn_bits; + s->private = (void *)PCL730_IDIO_LO; + + /* Isolated Digital Inputs */ s = &dev->subdevices[1]; - /* Isolated di */ - s->type = COMEDI_SUBD_DI; - s->subdev_flags = SDF_READABLE; - s->maxdata = 1; - s->n_chan = 16; - s->insn_bits = pcl730_di_insn_bits; - s->range_table = &range_digital; - s->private = (void *)PCL730_IDIO_LO; - + s->type = COMEDI_SUBD_DI; + s->subdev_flags = SDF_READABLE; + s->n_chan = 16; + s->maxdata = 1; + s->range_table = &range_digital; + s->insn_bits = pcl730_di_insn_bits; + s->private = (void *)PCL730_IDIO_LO; + + /* TTL Digital Outputs */ s = &dev->subdevices[2]; - /* TTL do */ - s->type = COMEDI_SUBD_DO; - s->subdev_flags = SDF_WRITABLE; - s->maxdata = 1; - s->n_chan = 16; - s->insn_bits = pcl730_do_insn_bits; - s->range_table = &range_digital; - s->private = (void *)PCL730_DIO_LO; - + s->type = COMEDI_SUBD_DO; + s->subdev_flags = SDF_WRITABLE; + s->n_chan = 16; + s->maxdata = 1; + s->range_table = &range_digital; + s->insn_bits = pcl730_do_insn_bits; + s->private = (void *)PCL730_DIO_LO; + + /* TTL Digital Inputs */ s = &dev->subdevices[3]; - /* TTL di */ - s->type = COMEDI_SUBD_DI; - s->subdev_flags = SDF_READABLE; - s->maxdata = 1; - s->n_chan = 16; - s->insn_bits = pcl730_di_insn_bits; - s->range_table = &range_digital; - s->private = (void *)PCL730_DIO_LO; - - printk(KERN_INFO "\n"); + s->type = COMEDI_SUBD_DI; + s->subdev_flags = SDF_READABLE; + s->n_chan = 16; + s->maxdata = 1; + s->range_table = &range_digital; + s->insn_bits = pcl730_di_insn_bits; + s->private = (void *)PCL730_DIO_LO; return 0; } |