[PATCH 16/21] staging: comedi: ni_at_ao: tidy up atao_attach()

[H Hartley Sweeten]

For aesthetics, add some whitespace to the subdevice init.

Remove the printk noise at the end of the attach.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/ni_at_ao.c | 47 +++++++++++++------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c 
b/drivers/staging/comedi/drivers/ni_at_ao.c
index b47eb9f..e1be07a 100644
--- a/drivers/staging/comedi/drivers/ni_at_ao.c
+++ b/drivers/staging/comedi/drivers/ni_at_ao.c
@@ -340,11 +340,8 @@ static int atao_attach(struct comedi_device *dev, struct 
comedi_devconfig *it)
        const struct atao_board *board = comedi_board(dev);
        struct atao_private *devpriv;
        struct comedi_subdevice *s;
-       int ao_unipolar;
        int ret;
 
-       ao_unipolar = it->options[3];
-
        ret = comedi_request_region(dev, it->options[0], 0x20);
        if (ret)
                return ret;
@@ -357,28 +354,25 @@ static int atao_attach(struct comedi_device *dev, struct 
comedi_devconfig *it)
        if (ret)
                return ret;
 
+       /* Analog Output subdevice */
        s = &dev->subdevices[0];
-       /* analog output subdevice */
-       s->type = COMEDI_SUBD_AO;
-       s->subdev_flags = SDF_WRITABLE;
-       s->n_chan = board->n_ao_chans;
-       s->maxdata = (1 << 12) - 1;
-       if (ao_unipolar)
-               s->range_table = &range_unipolar10;
-       else
-               s->range_table = &range_bipolar10;
-       s->insn_write = atao_ao_insn_write;
-       s->insn_read = atao_ao_insn_read;
-
+       s->type         = COMEDI_SUBD_AO;
+       s->subdev_flags = SDF_WRITABLE;
+       s->n_chan       = board->n_ao_chans;
+       s->maxdata      = 0x0fff;
+       s->range_table  = it->options[3] ? &range_unipolar10 : &range_bipolar10;
+       s->insn_write   = atao_ao_insn_write;
+       s->insn_read    = atao_ao_insn_read;
+
+       /* Digital I/O subdevice */
        s = &dev->subdevices[1];
-       /* digital i/o subdevice */
-       s->type = COMEDI_SUBD_DIO;
-       s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
-       s->n_chan = 8;
-       s->maxdata = 1;
-       s->range_table = &range_digital;
-       s->insn_bits = atao_dio_insn_bits;
-       s->insn_config = atao_dio_insn_config;
+       s->type         = COMEDI_SUBD_DIO;
+       s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
+       s->n_chan       = 8;
+       s->maxdata      = 1;
+       s->range_table  = &range_digital;
+       s->insn_bits    = atao_dio_insn_bits;
+       s->insn_config  = atao_dio_insn_config;
 
        /* caldac subdevice */
        s = &dev->subdevices[2];
@@ -389,15 +383,12 @@ static int atao_attach(struct comedi_device *dev, struct 
comedi_devconfig *it)
        s->insn_read    = atao_calib_insn_read;
        s->insn_write   = atao_calib_insn_write;
 
+       /* EEPROM subdevice */
        s = &dev->subdevices[3];
-       /* eeprom subdevice */
-       /* s->type=COMEDI_SUBD_EEPROM; */
-       s->type = COMEDI_SUBD_UNUSED;
+       s->type         = COMEDI_SUBD_UNUSED;
 
        atao_reset(dev);
 
-       printk(KERN_INFO "\n");
-
        return 0;
 }
 
-- 
1.8.3.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel