aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2015-06-18 13:54:59 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-19 00:19:04 -0400
commit1867e04db2ed067df9903400c96c33fe555becc3 (patch)
treed7ea42bf60edc32fed8ceec0fb4b41f6cab58820 /drivers/staging
parent1ee02fe1a100f57a2d35e78c38d22dedddc52ff4 (diff)
staging: comedi: addi_apci_1516: 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/addi_apci_1516.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index 9c516d1fe896..f1f8b1c422a7 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -100,10 +100,10 @@ static int apci1516_do_insn_bits(struct comedi_device *dev,
100 100
101static int apci1516_reset(struct comedi_device *dev) 101static int apci1516_reset(struct comedi_device *dev)
102{ 102{
103 const struct apci1516_boardinfo *this_board = dev->board_ptr; 103 const struct apci1516_boardinfo *board = dev->board_ptr;
104 struct apci1516_private *devpriv = dev->private; 104 struct apci1516_private *devpriv = dev->private;
105 105
106 if (!this_board->has_wdog) 106 if (!board->has_wdog)
107 return 0; 107 return 0;
108 108
109 outw(0x0, dev->iobase + APCI1516_DO_REG); 109 outw(0x0, dev->iobase + APCI1516_DO_REG);
@@ -117,17 +117,17 @@ static int apci1516_auto_attach(struct comedi_device *dev,
117 unsigned long context) 117 unsigned long context)
118{ 118{
119 struct pci_dev *pcidev = comedi_to_pci_dev(dev); 119 struct pci_dev *pcidev = comedi_to_pci_dev(dev);
120 const struct apci1516_boardinfo *this_board = NULL; 120 const struct apci1516_boardinfo *board = NULL;
121 struct apci1516_private *devpriv; 121 struct apci1516_private *devpriv;
122 struct comedi_subdevice *s; 122 struct comedi_subdevice *s;
123 int ret; 123 int ret;
124 124
125 if (context < ARRAY_SIZE(apci1516_boardtypes)) 125 if (context < ARRAY_SIZE(apci1516_boardtypes))
126 this_board = &apci1516_boardtypes[context]; 126 board = &apci1516_boardtypes[context];
127 if (!this_board) 127 if (!board)
128 return -ENODEV; 128 return -ENODEV;
129 dev->board_ptr = this_board; 129 dev->board_ptr = board;
130 dev->board_name = this_board->name; 130 dev->board_name = board->name;
131 131
132 devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); 132 devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
133 if (!devpriv) 133 if (!devpriv)
@@ -146,10 +146,10 @@ static int apci1516_auto_attach(struct comedi_device *dev,
146 146
147 /* Initialize the digital input subdevice */ 147 /* Initialize the digital input subdevice */
148 s = &dev->subdevices[0]; 148 s = &dev->subdevices[0];
149 if (this_board->di_nchan) { 149 if (board->di_nchan) {
150 s->type = COMEDI_SUBD_DI; 150 s->type = COMEDI_SUBD_DI;
151 s->subdev_flags = SDF_READABLE; 151 s->subdev_flags = SDF_READABLE;
152 s->n_chan = this_board->di_nchan; 152 s->n_chan = board->di_nchan;
153 s->maxdata = 1; 153 s->maxdata = 1;
154 s->range_table = &range_digital; 154 s->range_table = &range_digital;
155 s->insn_bits = apci1516_di_insn_bits; 155 s->insn_bits = apci1516_di_insn_bits;
@@ -159,10 +159,10 @@ static int apci1516_auto_attach(struct comedi_device *dev,
159 159
160 /* Initialize the digital output subdevice */ 160 /* Initialize the digital output subdevice */
161 s = &dev->subdevices[1]; 161 s = &dev->subdevices[1];
162 if (this_board->do_nchan) { 162 if (board->do_nchan) {
163 s->type = COMEDI_SUBD_DO; 163 s->type = COMEDI_SUBD_DO;
164 s->subdev_flags = SDF_WRITABLE; 164 s->subdev_flags = SDF_WRITABLE;
165 s->n_chan = this_board->do_nchan; 165 s->n_chan = board->do_nchan;
166 s->maxdata = 1; 166 s->maxdata = 1;
167 s->range_table = &range_digital; 167 s->range_table = &range_digital;
168 s->insn_bits = apci1516_do_insn_bits; 168 s->insn_bits = apci1516_do_insn_bits;
@@ -172,7 +172,7 @@ static int apci1516_auto_attach(struct comedi_device *dev,
172 172
173 /* Initialize the watchdog subdevice */ 173 /* Initialize the watchdog subdevice */
174 s = &dev->subdevices[2]; 174 s = &dev->subdevices[2];
175 if (this_board->has_wdog) { 175 if (board->has_wdog) {
176 ret = addi_watchdog_init(s, devpriv->wdog_iobase); 176 ret = addi_watchdog_init(s, devpriv->wdog_iobase);
177 if (ret) 177 if (ret)
178 return ret; 178 return ret;