Skip to content

Commit

Permalink
staging: comedi: ni_at_a2150: rename 'thisboard' variables
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 19, 2015
1 parent 30f2306 commit 94be3ef
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/staging/comedi/drivers/ni_at_a2150.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static int a2150_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,
unsigned int flags)
{
const struct a2150_board *thisboard = dev->board_ptr;
const struct a2150_board *board = dev->board_ptr;
struct a2150_private *devpriv = dev->private;
int lub, glb, temp;
int lub_divisor_shift, lub_index, glb_divisor_shift, glb_index;
Expand All @@ -273,10 +273,10 @@ static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,
/* initialize greatest lower and least upper bounds */
lub_divisor_shift = 3;
lub_index = 0;
lub = thisboard->clock[lub_index] * (1 << lub_divisor_shift);
lub = board->clock[lub_index] * (1 << lub_divisor_shift);
glb_divisor_shift = 0;
glb_index = thisboard->num_clocks - 1;
glb = thisboard->clock[glb_index] * (1 << glb_divisor_shift);
glb_index = board->num_clocks - 1;
glb = board->clock[glb_index] * (1 << glb_divisor_shift);

/* make sure period is in available range */
if (*period < glb)
Expand All @@ -287,9 +287,9 @@ static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,
/* we can multiply period by 1, 2, 4, or 8, using (1 << i) */
for (i = 0; i < 4; i++) {
/* there are a maximum of 4 master clocks */
for (j = 0; j < thisboard->num_clocks; j++) {
for (j = 0; j < board->num_clocks; j++) {
/* temp is the period in nanosec we are evaluating */
temp = thisboard->clock[j] * (1 << i);
temp = board->clock[j] * (1 << i);
/* if it is the best match yet */
if (temp < lub && temp >= *period) {
lub_divisor_shift = i;
Expand Down Expand Up @@ -413,7 +413,7 @@ static int a2150_ai_check_chanlist(struct comedi_device *dev,
static int a2150_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd)
{
const struct a2150_board *thisboard = dev->board_ptr;
const struct a2150_board *board = dev->board_ptr;
int err = 0;
unsigned int arg;

Expand Down Expand Up @@ -444,7 +444,7 @@ static int a2150_ai_cmdtest(struct comedi_device *dev,

if (cmd->convert_src == TRIG_TIMER) {
err |= comedi_check_trigger_arg_min(&cmd->convert_arg,
thisboard->ai_speed);
board->ai_speed);
}

err |= comedi_check_trigger_arg_min(&cmd->chanlist_len, 1);
Expand Down Expand Up @@ -699,7 +699,7 @@ static const struct a2150_board *a2150_probe(struct comedi_device *dev)

static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
const struct a2150_board *thisboard;
const struct a2150_board *board;
struct a2150_private *devpriv;
struct comedi_subdevice *s;
static const int timeout = 2000;
Expand All @@ -714,11 +714,11 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;

thisboard = a2150_probe(dev);
if (!thisboard)
board = a2150_probe(dev);
if (!board)
return -ENODEV;
dev->board_ptr = thisboard;
dev->board_name = thisboard->name;
dev->board_ptr = board;
dev->board_name = board->name;

/* an IRQ and DMA are required to support async commands */
a2150_alloc_irq_and_dma(dev, it);
Expand Down

0 comments on commit 94be3ef

Please sign in to comment.