On 23/03/18 10:49, Jian Zhang wrote:
This is a patch to the cb_pcidas64.c file that fixes up a multiple line
dereference warning found by the checkpatch.pl tool.

Signed-off-by: Jian Zhang <ker...@ubicomp.com.au>
---
  drivers/staging/comedi/drivers/cb_pcidas64.c | 19 ++++++++++---------
  1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c 
b/drivers/staging/comedi/drivers/cb_pcidas64.c
index ceef9058b59f..47cef32133ad 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -2462,20 +2462,21 @@ static int setup_channel_queue(struct comedi_device 
*dev,
                        writew(0, devpriv->main_iobase + ADC_QUEUE_CLEAR_REG);
                        /* load external queue */
                        for (i = 0; i < cmd->chanlist_len; i++) {
+                               unsigned int chanspec = cmd->chanlist[i];
+                               int use_differential;
+
                                bits = 0;
                                /* set channel */
-                               bits |= adc_chan_bits(CR_CHAN(cmd->
-                                                             chanlist[i]));
+                               bits |= adc_chan_bits(CR_CHAN(chanspec));
                                /* set gain */
                                bits |= ai_range_bits_6xxx(dev,
-                                                          CR_RANGE(cmd->
-                                                                   chanlist
-                                                                   [i]));
+                                                          CR_RANGE(chanspec));
                                /* set single-ended / differential */
-                               bits |= se_diff_bit_6xxx(dev,
-                                                        CR_AREF(cmd->
-                                                                chanlist[i]) ==
-                                                        AREF_DIFF);
+                               use_differential = 0;
+                               if (CR_AREF(chanspec) == AREF_DIFF)
+                                       use_differential = 1;
+                               bits |= se_diff_bit_6xxx(dev, use_differential);
+
                                if (CR_AREF(cmd->chanlist[i]) == AREF_COMMON)
                                        bits |= ADC_COMMON_BIT;
                                /* mark end of queue */


Looks good, thanks!

Reviewed-by: Ian Abbott <abbo...@mev.co.uk>

--
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbo...@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to