Skip to content

Commit

Permalink
staging: comedi: ni_at_a2150: remove 'thisboard' macro
Browse files Browse the repository at this point in the history
The 'thisboard' macro relies on a local variable having a specific
name and yields a pointer derived from that local variable.

Replace the macro with local variables and use the comedi_board()
helper to get the pointer.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: 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 Apr 8, 2013
1 parent a56ec2f commit e8e1560
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/staging/comedi/drivers/ni_at_a2150.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,6 @@ static const struct a2150_board a2150_boards[] = {
},
};

/*
* Useful for shorthand access to the particular board structure
*/
#define thisboard ((const struct a2150_board *)dev->board_ptr)

struct a2150_private {

volatile unsigned int count; /* number of data points left to be taken */
Expand Down Expand Up @@ -319,6 +314,7 @@ static int a2150_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
static int a2150_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd)
{
const struct a2150_board *thisboard = comedi_board(dev);
int err = 0;
int tmp;
int startChan;
Expand Down Expand Up @@ -604,6 +600,7 @@ static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,
int flags)
{
const struct a2150_board *thisboard = comedi_board(dev);
struct a2150_private *devpriv = dev->private;
int lub, glb, temp;
int lub_divisor_shift, lub_index, glb_divisor_shift, glb_index;
Expand Down Expand Up @@ -719,6 +716,7 @@ static int a2150_probe(struct comedi_device *dev)

static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
const struct a2150_board *thisboard = comedi_board(dev);
struct a2150_private *devpriv;
struct comedi_subdevice *s;
unsigned long iobase = it->options[0];
Expand Down Expand Up @@ -797,6 +795,7 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}

dev->board_ptr = a2150_boards + a2150_probe(dev);
thisboard = comedi_board(dev);
dev->board_name = thisboard->name;

ret = comedi_alloc_subdevices(dev, 1);
Expand Down

0 comments on commit e8e1560

Please sign in to comment.