mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-07 11:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: ni_mio_common: tidy up the calibration subdevice init

Browse Source 
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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2014-07-14 12:24:01 -07:00
committed by Greg Kroah-Hartman
parent eeca0caa84
commit cb42950615
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/comedi/drivers/ni_mio_common.c
View File

@@ -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);
}