diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-06-18 13:54:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-19 00:19:03 -0400 |
commit | 476f62eb168f3835cdd268154f4fce441277974e (patch) | |
tree | d9b52c0c62be6190ea68d72defa642389b628603 /drivers/staging | |
parent | 1a127f311545a052a6560686d03ca028dc138969 (diff) |
staging: comedi: dt3000: rename 'this_board' variables
For aesthetics, rename the 'this_board' 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/dt3000.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c index 031282c82f43..8c4f284d1919 100644 --- a/drivers/staging/comedi/drivers/dt3000.c +++ b/drivers/staging/comedi/drivers/dt3000.c | |||
@@ -400,7 +400,7 @@ static int dt3k_ns_to_timer(unsigned int timer_base, unsigned int *nanosec, | |||
400 | static int dt3k_ai_cmdtest(struct comedi_device *dev, | 400 | static int dt3k_ai_cmdtest(struct comedi_device *dev, |
401 | struct comedi_subdevice *s, struct comedi_cmd *cmd) | 401 | struct comedi_subdevice *s, struct comedi_cmd *cmd) |
402 | { | 402 | { |
403 | const struct dt3k_boardtype *this_board = dev->board_ptr; | 403 | const struct dt3k_boardtype *board = dev->board_ptr; |
404 | int err = 0; | 404 | int err = 0; |
405 | unsigned int arg; | 405 | unsigned int arg; |
406 | 406 | ||
@@ -424,14 +424,14 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev, | |||
424 | 424 | ||
425 | if (cmd->scan_begin_src == TRIG_TIMER) { | 425 | if (cmd->scan_begin_src == TRIG_TIMER) { |
426 | err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg, | 426 | err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg, |
427 | this_board->ai_speed); | 427 | board->ai_speed); |
428 | err |= comedi_check_trigger_arg_max(&cmd->scan_begin_arg, | 428 | err |= comedi_check_trigger_arg_max(&cmd->scan_begin_arg, |
429 | 100 * 16 * 65535); | 429 | 100 * 16 * 65535); |
430 | } | 430 | } |
431 | 431 | ||
432 | if (cmd->convert_src == TRIG_TIMER) { | 432 | if (cmd->convert_src == TRIG_TIMER) { |
433 | err |= comedi_check_trigger_arg_min(&cmd->convert_arg, | 433 | err |= comedi_check_trigger_arg_min(&cmd->convert_arg, |
434 | this_board->ai_speed); | 434 | board->ai_speed); |
435 | err |= comedi_check_trigger_arg_max(&cmd->convert_arg, | 435 | err |= comedi_check_trigger_arg_max(&cmd->convert_arg, |
436 | 50 * 16 * 65535); | 436 | 50 * 16 * 65535); |
437 | } | 437 | } |
@@ -635,17 +635,17 @@ static int dt3000_auto_attach(struct comedi_device *dev, | |||
635 | unsigned long context) | 635 | unsigned long context) |
636 | { | 636 | { |
637 | struct pci_dev *pcidev = comedi_to_pci_dev(dev); | 637 | struct pci_dev *pcidev = comedi_to_pci_dev(dev); |
638 | const struct dt3k_boardtype *this_board = NULL; | 638 | const struct dt3k_boardtype *board = NULL; |
639 | struct dt3k_private *devpriv; | 639 | struct dt3k_private *devpriv; |
640 | struct comedi_subdevice *s; | 640 | struct comedi_subdevice *s; |
641 | int ret = 0; | 641 | int ret = 0; |
642 | 642 | ||
643 | if (context < ARRAY_SIZE(dt3k_boardtypes)) | 643 | if (context < ARRAY_SIZE(dt3k_boardtypes)) |
644 | this_board = &dt3k_boardtypes[context]; | 644 | board = &dt3k_boardtypes[context]; |
645 | if (!this_board) | 645 | if (!board) |
646 | return -ENODEV; | 646 | return -ENODEV; |
647 | dev->board_ptr = this_board; | 647 | dev->board_ptr = board; |
648 | dev->board_name = this_board->name; | 648 | dev->board_name = board->name; |
649 | 649 | ||
650 | devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); | 650 | devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); |
651 | if (!devpriv) | 651 | if (!devpriv) |
@@ -674,9 +674,9 @@ static int dt3000_auto_attach(struct comedi_device *dev, | |||
674 | /* ai subdevice */ | 674 | /* ai subdevice */ |
675 | s->type = COMEDI_SUBD_AI; | 675 | s->type = COMEDI_SUBD_AI; |
676 | s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF; | 676 | s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF; |
677 | s->n_chan = this_board->adchan; | 677 | s->n_chan = board->adchan; |
678 | s->insn_read = dt3k_ai_insn; | 678 | s->insn_read = dt3k_ai_insn; |
679 | s->maxdata = (1 << this_board->adbits) - 1; | 679 | s->maxdata = (1 << board->adbits) - 1; |
680 | s->range_table = &range_dt3000_ai; /* XXX */ | 680 | s->range_table = &range_dt3000_ai; /* XXX */ |
681 | if (dev->irq) { | 681 | if (dev->irq) { |
682 | dev->read_subdev = s; | 682 | dev->read_subdev = s; |
@@ -692,7 +692,7 @@ static int dt3000_auto_attach(struct comedi_device *dev, | |||
692 | s->type = COMEDI_SUBD_AO; | 692 | s->type = COMEDI_SUBD_AO; |
693 | s->subdev_flags = SDF_WRITABLE; | 693 | s->subdev_flags = SDF_WRITABLE; |
694 | s->n_chan = 2; | 694 | s->n_chan = 2; |
695 | s->maxdata = (1 << this_board->dabits) - 1; | 695 | s->maxdata = (1 << board->dabits) - 1; |
696 | s->len_chanlist = 1; | 696 | s->len_chanlist = 1; |
697 | s->range_table = &range_bipolar10; | 697 | s->range_table = &range_bipolar10; |
698 | s->insn_write = dt3k_ao_insn_write; | 698 | s->insn_write = dt3k_ao_insn_write; |