Skip to content

Commit

Permalink
staging: comedi: cb_pcidda: rename 'thisboard' variables
Browse files Browse the repository at this point in the history
For aesthetics, rename the 'thisboard' variables to 'board'. That name
is more commonly used for the boardinfo pointer in comedi drivers.

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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 19, 2015
1 parent 5e97650 commit 91d4beb
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/staging/comedi/drivers/cb_pcidda.c
Original file line number Diff line number Diff line change
Expand Up @@ -335,18 +335,18 @@ static int cb_pcidda_auto_attach(struct comedi_device *dev,
unsigned long context)
{
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
const struct cb_pcidda_board *thisboard = NULL;
const struct cb_pcidda_board *board = NULL;
struct cb_pcidda_private *devpriv;
struct comedi_subdevice *s;
int i;
int ret;

if (context < ARRAY_SIZE(cb_pcidda_boards))
thisboard = &cb_pcidda_boards[context];
if (!thisboard)
board = &cb_pcidda_boards[context];
if (!board)
return -ENODEV;
dev->board_ptr = thisboard;
dev->board_name = thisboard->name;
dev->board_ptr = board;
dev->board_name = board->name;

devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
Expand All @@ -366,8 +366,8 @@ static int cb_pcidda_auto_attach(struct comedi_device *dev,
/* analog output subdevice */
s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITABLE;
s->n_chan = thisboard->ao_chans;
s->maxdata = (1 << thisboard->ao_bits) - 1;
s->n_chan = board->ao_chans;
s->maxdata = (1 << board->ao_bits) - 1;
s->range_table = &cb_pcidda_ranges;
s->insn_write = cb_pcidda_ao_insn_write;

Expand All @@ -384,7 +384,7 @@ static int cb_pcidda_auto_attach(struct comedi_device *dev,
devpriv->eeprom_data[i] = cb_pcidda_read_eeprom(dev, i);

/* set calibrations dacs */
for (i = 0; i < thisboard->ao_chans; i++)
for (i = 0; i < board->ao_chans; i++)
cb_pcidda_calibrate(dev, i, devpriv->ao_range[i]);

return 0;
Expand Down

0 comments on commit 91d4beb

Please sign in to comment.