aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-04-22 21:38:06 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-23 13:41:52 -0400
commitd24160f83d5fd7d4ef383085cae90aa27ce63ed6 (patch)
tree05c08678f642b45beac2fdfacf155ba6587c3e72
parentad5774fcd2cd40dd8a0f3d9db9b0a3538d47e610 (diff)
staging: comedi: das800: rename CamelCase vars in das800_ai_do_cmd()
Rename the CamelCase variables in das800_ai_do_cmd(). For aesthetic reasons, initialize the variables when they are declared. 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>
-rw-r--r--drivers/staging/comedi/drivers/das800.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index 9eced6205511..bb0c40627ae2 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -407,25 +407,22 @@ static int das800_ai_do_cmd(struct comedi_device *dev,
407{ 407{
408 const struct das800_board *thisboard = comedi_board(dev); 408 const struct das800_board *thisboard = comedi_board(dev);
409 struct das800_private *devpriv = dev->private; 409 struct das800_private *devpriv = dev->private;
410 int startChan, endChan, scan, gain; 410 struct comedi_async *async = s->async;
411 unsigned int gain = CR_RANGE(async->cmd.chanlist[0]);
412 unsigned int start_chan = CR_CHAN(async->cmd.chanlist[0]);
413 unsigned int end_chan = (start_chan + async->cmd.chanlist_len - 1) % 8;
414 unsigned int scan_chans = (end_chan << 3) | start_chan;
411 int conv_bits; 415 int conv_bits;
412 unsigned long irq_flags; 416 unsigned long irq_flags;
413 struct comedi_async *async = s->async;
414 417
415 das800_disable(dev); 418 das800_disable(dev);
416 419
417 /* set channel scan limits */
418 startChan = CR_CHAN(async->cmd.chanlist[0]);
419 endChan = (startChan + async->cmd.chanlist_len - 1) % 8;
420 scan = (endChan << 3) | startChan;
421
422 spin_lock_irqsave(&dev->spinlock, irq_flags); 420 spin_lock_irqsave(&dev->spinlock, irq_flags);
423 /* set scan limits */ 421 /* set scan limits */
424 das800_ind_write(dev, scan, SCAN_LIMITS); 422 das800_ind_write(dev, scan_chans, SCAN_LIMITS);
425 spin_unlock_irqrestore(&dev->spinlock, irq_flags); 423 spin_unlock_irqrestore(&dev->spinlock, irq_flags);
426 424
427 /* set gain */ 425 /* set gain */
428 gain = CR_RANGE(async->cmd.chanlist[0]);
429 if (thisboard->resolution == 12 && gain > 0) 426 if (thisboard->resolution == 12 && gain > 0)
430 gain += 0x7; 427 gain += 0x7;
431 gain &= 0xf; 428 gain &= 0xf;