diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-22 18:38:06 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-23 10:41:52 -0700 |
| commit | d24160f83d5fd7d4ef383085cae90aa27ce63ed6 (patch) | |
| tree | 05c08678f642b45beac2fdfacf155ba6587c3e72 /drivers | |
| parent | staging: comedi: das800: tidy up the private data (diff) | |
| download | linux-dev-d24160f83d5fd7d4ef383085cae90aa27ce63ed6.tar.xz linux-dev-d24160f83d5fd7d4ef383085cae90aa27ce63ed6.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/das800.c | 15 |
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, { const struct das800_board *thisboard = comedi_board(dev); struct das800_private *devpriv = dev->private; - int startChan, endChan, scan, gain; + struct comedi_async *async = s->async; + unsigned int gain = CR_RANGE(async->cmd.chanlist[0]); + unsigned int start_chan = CR_CHAN(async->cmd.chanlist[0]); + unsigned int end_chan = (start_chan + async->cmd.chanlist_len - 1) % 8; + unsigned int scan_chans = (end_chan << 3) | start_chan; int conv_bits; unsigned long irq_flags; - struct comedi_async *async = s->async; das800_disable(dev); - /* set channel scan limits */ - startChan = CR_CHAN(async->cmd.chanlist[0]); - endChan = (startChan + async->cmd.chanlist_len - 1) % 8; - scan = (endChan << 3) | startChan; - spin_lock_irqsave(&dev->spinlock, irq_flags); /* set scan limits */ - das800_ind_write(dev, scan, SCAN_LIMITS); + das800_ind_write(dev, scan_chans, SCAN_LIMITS); spin_unlock_irqrestore(&dev->spinlock, irq_flags); /* set gain */ - gain = CR_RANGE(async->cmd.chanlist[0]); if (thisboard->resolution == 12 && gain > 0) gain += 0x7; gain &= 0xf; |