[PATCH 24/28] staging: comedi: ni_mio_common: tidy up the calibration subdevice init

[H Hartley Sweeten]

For aesthetics, add some whitespace to the subdevice init.

Refactor the code so that the common parts of the subdevice are initialized
in one place.

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

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c 
b/drivers/staging/comedi/drivers/ni_mio_common.c
index e60b9e6..49c22d6 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -5642,26 +5642,26 @@ static int ni_E_init(struct comedi_device *dev,
        s = &dev->subdevices[NI_UNUSED_SUBDEV];
        s->type = COMEDI_SUBD_UNUSED;
 
-       /* calibration subdevice -- ai and ao */
+       /* Calibration subdevice */
        s = &dev->subdevices[NI_CALIBRATION_SUBDEV];
-       s->type = COMEDI_SUBD_CALIB;
+       s->type         = COMEDI_SUBD_CALIB;
+       s->subdev_flags = SDF_INTERNAL;
+       s->n_chan       = 1;
+       s->maxdata      = 0;
        if (devpriv->is_m_series) {
-               /*  internal PWM analog output used for AI nonlinearity 
calibration */
-               s->subdev_flags = SDF_INTERNAL;
-               s->insn_config = &ni_m_series_pwm_config;
-               s->n_chan = 1;
-               s->maxdata = 0;
+               /* internal PWM output used for AI nonlinearity calibration */
+               s->insn_config  = ni_m_series_pwm_config;
+
                ni_writel(dev, 0x0, M_Offset_Cal_PWM);
        } else if (devpriv->is_6143) {
-               /*  internal PWM analog output used for AI nonlinearity 
calibration */
-               s->subdev_flags = SDF_INTERNAL;
-               s->insn_config = &ni_6143_pwm_config;
-               s->n_chan = 1;
-               s->maxdata = 0;
+               /* internal PWM output used for AI nonlinearity calibration */
+               s->insn_config  = ni_6143_pwm_config;
        } else {
-               s->subdev_flags = SDF_WRITABLE | SDF_INTERNAL;
-               s->insn_read = &ni_calib_insn_read;
-               s->insn_write = &ni_calib_insn_write;
+               s->subdev_flags |= SDF_WRITABLE;
+               s->insn_read    = ni_calib_insn_read;
+               s->insn_write   = ni_calib_insn_write;
+
+               /* setup the caldacs and find the real n_chan and maxdata */
                caldac_setup(dev, s);
        }
 
-- 
1.9.3

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