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>

diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index 9c516d1..f1f8b1c 100644 (file)
--- 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,
 
 static int apci1516_reset(struct comedi_device *dev)
 {
-       const struct apci1516_boardinfo *this_board = dev->board_ptr;
+       const struct apci1516_boardinfo *board = dev->board_ptr;
        struct apci1516_private *devpriv = dev->private;
 
-       if (!this_board->has_wdog)
+       if (!board->has_wdog)
                return 0;
 
        outw(0x0, dev->iobase + APCI1516_DO_REG);
@@ -117,17 +117,17 @@ static int apci1516_auto_attach(struct comedi_device *dev,
                                unsigned long context)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-       const struct apci1516_boardinfo *this_board = NULL;
+       const struct apci1516_boardinfo *board = NULL;
        struct apci1516_private *devpriv;
        struct comedi_subdevice *s;
        int ret;
 
        if (context < ARRAY_SIZE(apci1516_boardtypes))
-               this_board = &apci1516_boardtypes[context];
-       if (!this_board)
+               board = &apci1516_boardtypes[context];
+       if (!board)
                return -ENODEV;
-       dev->board_ptr = this_board;
-       dev->board_name = this_board->name;
+       dev->board_ptr = board;
+       dev->board_name = board->name;
 
        devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
        if (!devpriv)
@@ -146,10 +146,10 @@ static int apci1516_auto_attach(struct comedi_device *dev,
 
        /* Initialize the digital input subdevice */
        s = &dev->subdevices[0];
-       if (this_board->di_nchan) {
+       if (board->di_nchan) {
                s->type         = COMEDI_SUBD_DI;
                s->subdev_flags = SDF_READABLE;
-               s->n_chan       = this_board->di_nchan;
+               s->n_chan       = board->di_nchan;
                s->maxdata      = 1;
                s->range_table  = &range_digital;
                s->insn_bits    = apci1516_di_insn_bits;
@@ -159,10 +159,10 @@ static int apci1516_auto_attach(struct comedi_device *dev,
 
        /* Initialize the digital output subdevice */
        s = &dev->subdevices[1];
-       if (this_board->do_nchan) {
+       if (board->do_nchan) {
                s->type         = COMEDI_SUBD_DO;
                s->subdev_flags = SDF_WRITABLE;
-               s->n_chan       = this_board->do_nchan;
+               s->n_chan       = board->do_nchan;
                s->maxdata      = 1;
                s->range_table  = &range_digital;
                s->insn_bits    = apci1516_do_insn_bits;
@@ -172,7 +172,7 @@ static int apci1516_auto_attach(struct comedi_device *dev,
 
        /* Initialize the watchdog subdevice */
        s = &dev->subdevices[2];
-       if (this_board->has_wdog) {
+       if (board->has_wdog) {
                ret = addi_watchdog_init(s, devpriv->wdog_iobase);
                if (ret)
                        return ret;