diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-06-18 13:54:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-19 00:19:00 -0400 |
commit | 91d4beba92477aab8bdf5084d538d28c2a9e3081 (patch) | |
tree | b22197108bd5c1dfa92772ef9964db37c897f001 /drivers/staging | |
parent | 5e97650cf506bbaacc3149c07bc2c7dcae4f13af (diff) |
staging: comedi: cb_pcidda: rename 'thisboard' variables
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidda.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c index 30c9e27d1ed9..b00a36a5cb36 100644 --- a/drivers/staging/comedi/drivers/cb_pcidda.c +++ b/drivers/staging/comedi/drivers/cb_pcidda.c | |||
@@ -335,18 +335,18 @@ static int cb_pcidda_auto_attach(struct comedi_device *dev, | |||
335 | unsigned long context) | 335 | unsigned long context) |
336 | { | 336 | { |
337 | struct pci_dev *pcidev = comedi_to_pci_dev(dev); | 337 | struct pci_dev *pcidev = comedi_to_pci_dev(dev); |
338 | const struct cb_pcidda_board *thisboard = NULL; | 338 | const struct cb_pcidda_board *board = NULL; |
339 | struct cb_pcidda_private *devpriv; | 339 | struct cb_pcidda_private *devpriv; |
340 | struct comedi_subdevice *s; | 340 | struct comedi_subdevice *s; |
341 | int i; | 341 | int i; |
342 | int ret; | 342 | int ret; |
343 | 343 | ||
344 | if (context < ARRAY_SIZE(cb_pcidda_boards)) | 344 | if (context < ARRAY_SIZE(cb_pcidda_boards)) |
345 | thisboard = &cb_pcidda_boards[context]; | 345 | board = &cb_pcidda_boards[context]; |
346 | if (!thisboard) | 346 | if (!board) |
347 | return -ENODEV; | 347 | return -ENODEV; |
348 | dev->board_ptr = thisboard; | 348 | dev->board_ptr = board; |
349 | dev->board_name = thisboard->name; | 349 | dev->board_name = board->name; |
350 | 350 | ||
351 | devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); | 351 | devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); |
352 | if (!devpriv) | 352 | if (!devpriv) |
@@ -366,8 +366,8 @@ static int cb_pcidda_auto_attach(struct comedi_device *dev, | |||
366 | /* analog output subdevice */ | 366 | /* analog output subdevice */ |
367 | s->type = COMEDI_SUBD_AO; | 367 | s->type = COMEDI_SUBD_AO; |
368 | s->subdev_flags = SDF_WRITABLE; | 368 | s->subdev_flags = SDF_WRITABLE; |
369 | s->n_chan = thisboard->ao_chans; | 369 | s->n_chan = board->ao_chans; |
370 | s->maxdata = (1 << thisboard->ao_bits) - 1; | 370 | s->maxdata = (1 << board->ao_bits) - 1; |
371 | s->range_table = &cb_pcidda_ranges; | 371 | s->range_table = &cb_pcidda_ranges; |
372 | s->insn_write = cb_pcidda_ao_insn_write; | 372 | s->insn_write = cb_pcidda_ao_insn_write; |
373 | 373 | ||
@@ -384,7 +384,7 @@ static int cb_pcidda_auto_attach(struct comedi_device *dev, | |||
384 | devpriv->eeprom_data[i] = cb_pcidda_read_eeprom(dev, i); | 384 | devpriv->eeprom_data[i] = cb_pcidda_read_eeprom(dev, i); |
385 | 385 | ||
386 | /* set calibrations dacs */ | 386 | /* set calibrations dacs */ |
387 | for (i = 0; i < thisboard->ao_chans; i++) | 387 | for (i = 0; i < board->ao_chans; i++) |
388 | cb_pcidda_calibrate(dev, i, devpriv->ao_range[i]); | 388 | cb_pcidda_calibrate(dev, i, devpriv->ao_range[i]); |
389 | 389 | ||
390 | return 0; | 390 | return 0; |