staging: comedi: cb_pcidas: cleanup cb_pcidas_ai_rinsn()
PATCH 35/36 staging: comedi: cb_pcidas: cleanup cb_pcidas_ai_rinsn()
Create local variables for the channel, range, and aref in order to make the remaining code a bit cleaner.
Remove the extra space in all the comments.
Remove the 'static const int timeout' and just use the open coded value in the loop.
Signed-off-by H Hartley Sweeten <[email protected]>
Cc Ian Abbott <[email protected]>
Cc Frank Mori Hess <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
--- drivers/staging/comedi/drivers/cb_pcidas.c | 35 ++++++++++++++---------------- 1 file changed, 16 insertions(+), 19 deletions(-)
drivers/staging/comedi/drivers/cb_pcidas.c +16 -19
@@ -382,36 +382,33 @@ static inline unsigned int cal_enable_bits(struct comedi_device *dev)return CAL_EN_BIT |CAL_SRC_BITS (devpriv->calibration_source); } -/* -* "instructions" read/write data in "one-shot" or "software-triggered" -* mode. -*/ static int cb_pcidas_ai_rinsn (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) {struct cb_pcidas_private *devpriv = dev->private; -int n, i; +unsigned int chan =CR_CHAN (insn->chanspec); +unsigned int range =CR_RANGE (insn->chanspec); +unsigned int aref =CR_AREF (insn->chanspec);unsigned int bits; -static const int timeout =10000 ; -int channel; -/* enable calibration input if appropriate */ +int n, i; + +/* enable calibration input if appropriate */ if (insn->chanspec &CR_ALT_SOURCE ) {outw (cal_enable_bits (dev), devpriv->control_status +CALIBRATION_REG ); - channel =0 ; + chan =0 ; }else {outw (0 , devpriv->control_status +CALIBRATION_REG ); - channel =CR_CHAN (insn->chanspec); } -/* set mux limits and gain */ - bits =BEGIN_SCAN (channel) | -END_SCAN (channel) |GAIN_BITS (CR_RANGE (insn->chanspec)); -/* set unipolar/bipolar */ -if (CR_RANGE (insn->chanspec) &IS_UNIPOLAR ) + +/* set mux limits and gain */ + bits =BEGIN_SCAN (chan) |END_SCAN (chan) |GAIN_BITS (range); +/* set unipolar/bipolar */ +if (range &IS_UNIPOLAR ) bits |=UNIP ; -/* set singleended/differential */ -if (CR_AREF (insn->chanspec) !=AREF_DIFF ) +/* set single-ended/differential */ +if (aref !=AREF_DIFF ) bits |=SE ;outw (bits, devpriv->control_status +ADCMUX_CONT );
@@ -425,11 +422,11 @@ static int cb_pcidas_ai_rinsn(struct comedi_device *dev,/* wait for conversion to end */ /* return -ETIMEDOUT if there is a timeout */ -for (i =0 ; i < timeout; i++) { +for (i =0 ; i <10000 ; i++) {if (inw (devpriv->control_status +ADCMUX_CONT ) &EOC )break ; } -if (i == timeout) +if (i ==10000 )return -ETIMEDOUT ;/* read data */
Signature · 1 line
1.7.11