diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-06-18 13:55:00 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-19 00:19:04 -0400 |
commit | 52a79403cb4dd9b5993691733a07e5cb42e3446b (patch) | |
tree | 290049680050cca902832fceacaa3bea6a864451 | |
parent | 1867e04db2ed067df9903400c96c33fe555becc3 (diff) |
staging: comedi: addi_apci_3120: 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>
-rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3120.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c index 95dc64bfec73..5bfd43d5c889 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/drivers/staging/comedi/drivers/addi_apci_3120.c | |||
@@ -977,18 +977,18 @@ static int apci3120_auto_attach(struct comedi_device *dev, | |||
977 | unsigned long context) | 977 | unsigned long context) |
978 | { | 978 | { |
979 | struct pci_dev *pcidev = comedi_to_pci_dev(dev); | 979 | struct pci_dev *pcidev = comedi_to_pci_dev(dev); |
980 | const struct apci3120_board *this_board = NULL; | 980 | const struct apci3120_board *board = NULL; |
981 | struct apci3120_private *devpriv; | 981 | struct apci3120_private *devpriv; |
982 | struct comedi_subdevice *s; | 982 | struct comedi_subdevice *s; |
983 | unsigned int status; | 983 | unsigned int status; |
984 | int ret; | 984 | int ret; |
985 | 985 | ||
986 | if (context < ARRAY_SIZE(apci3120_boardtypes)) | 986 | if (context < ARRAY_SIZE(apci3120_boardtypes)) |
987 | this_board = &apci3120_boardtypes[context]; | 987 | board = &apci3120_boardtypes[context]; |
988 | if (!this_board) | 988 | if (!board) |
989 | return -ENODEV; | 989 | return -ENODEV; |
990 | dev->board_ptr = this_board; | 990 | dev->board_ptr = board; |
991 | dev->board_name = this_board->name; | 991 | dev->board_name = board->name; |
992 | 992 | ||
993 | devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); | 993 | devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); |
994 | if (!devpriv) | 994 | if (!devpriv) |
@@ -1031,7 +1031,7 @@ static int apci3120_auto_attach(struct comedi_device *dev, | |||
1031 | s->type = COMEDI_SUBD_AI; | 1031 | s->type = COMEDI_SUBD_AI; |
1032 | s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF; | 1032 | s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF; |
1033 | s->n_chan = 16; | 1033 | s->n_chan = 16; |
1034 | s->maxdata = this_board->ai_is_16bit ? 0xffff : 0x0fff; | 1034 | s->maxdata = board->ai_is_16bit ? 0xffff : 0x0fff; |
1035 | s->range_table = &apci3120_ai_range; | 1035 | s->range_table = &apci3120_ai_range; |
1036 | s->insn_read = apci3120_ai_insn_read; | 1036 | s->insn_read = apci3120_ai_insn_read; |
1037 | if (dev->irq) { | 1037 | if (dev->irq) { |
@@ -1045,7 +1045,7 @@ static int apci3120_auto_attach(struct comedi_device *dev, | |||
1045 | 1045 | ||
1046 | /* Analog Output subdevice */ | 1046 | /* Analog Output subdevice */ |
1047 | s = &dev->subdevices[1]; | 1047 | s = &dev->subdevices[1]; |
1048 | if (this_board->has_ao) { | 1048 | if (board->has_ao) { |
1049 | s->type = COMEDI_SUBD_AO; | 1049 | s->type = COMEDI_SUBD_AO; |
1050 | s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON; | 1050 | s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON; |
1051 | s->n_chan = 8; | 1051 | s->n_chan = 8; |