diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-19 15:13:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-21 09:19:45 -0700 |
| commit | bda60cbfe252ad5ba7d4df4cc17c0f55e8b54599 (patch) | |
| tree | 470846ffc6152804f1f25aae3dbcb47eb5eb6d3c /drivers/staging/comedi/drivers/s526.c | |
| parent | 675f98f101fb6d1a694a03961b36997cb407dfae (diff) | |
staging: comedi: s526: rename s526_ai_config
For aesthetic reasons, rename the private data variable
's526_ai_config' to simply 'ai_config'. Its private data
and does not need the 's526_' namespace.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/s526.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/s526.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c index e1927cf28e2e..4ad6adfcbb9c 100644 --- a/drivers/staging/comedi/drivers/s526.c +++ b/drivers/staging/comedi/drivers/s526.c @@ -121,7 +121,7 @@ union cmReg { struct s526_private { unsigned int ao_readback[2]; unsigned int gpct_config[4]; - unsigned short s526_ai_config; + unsigned short ai_config; }; static int s526_gpct_rinsn(struct comedi_device *dev, @@ -416,11 +416,11 @@ static int s526_ai_insn_config(struct comedi_device *dev, /* Enable ADC interrupt */ outw(ISR_ADC_DONE, dev->iobase + REG_IER); - devpriv->s526_ai_config = (data[0] & 0x3FF) << 5; + devpriv->ai_config = (data[0] & 0x3ff) << 5; if (data[1] > 0) - devpriv->s526_ai_config |= 0x8000; /* set the delay */ + devpriv->ai_config |= 0x8000; /* set the delay */ - devpriv->s526_ai_config |= 0x0001; /* ADC start bit. */ + devpriv->ai_config |= 0x0001; /* ADC start bit */ return result; } @@ -437,8 +437,8 @@ static int s526_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, /* Set configured delay, enable channel for this channel only, * select "ADC read" channel, set "ADC start" bit. */ - value = (devpriv->s526_ai_config & 0x8000) | - ((1 << 5) << chan) | (chan << 1) | 0x0001; + value = (devpriv->ai_config & 0x8000) | + ((1 << 5) << chan) | (chan << 1) | 0x0001; /* convert n samples */ for (n = 0; n < insn->n; n++) { |