Commit 75b9ad9e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: remove thisboard macro in the ni_at_ao driver

The 'thisboard' macro depends on having a local variable with
a magic name. The CodingStyle document suggests not doing this
to avoid confusion. Remove the macro and use the comedi_board()
inline helper to get the dev->board_ptr information.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27b40b89
...@@ -157,8 +157,6 @@ struct atao_board { ...@@ -157,8 +157,6 @@ struct atao_board {
int n_ao_chans; int n_ao_chans;
}; };
#define thisboard ((struct atao_board *)dev->board_ptr)
struct atao_private { struct atao_private {
unsigned short cfg1; unsigned short cfg1;
...@@ -335,6 +333,7 @@ static int atao_calib_insn_write(struct comedi_device *dev, ...@@ -335,6 +333,7 @@ static int atao_calib_insn_write(struct comedi_device *dev,
static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it) static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{ {
const struct atao_board *board = comedi_board(dev);
struct comedi_subdevice *s; struct comedi_subdevice *s;
unsigned long iobase; unsigned long iobase;
int ao_unipolar; int ao_unipolar;
...@@ -352,9 +351,7 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -352,9 +351,7 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
} }
dev->iobase = iobase; dev->iobase = iobase;
/* dev->board_ptr = atao_probe(dev); */ dev->board_name = board->name;
dev->board_name = thisboard->name;
if (alloc_private(dev, sizeof(struct atao_private)) < 0) if (alloc_private(dev, sizeof(struct atao_private)) < 0)
return -ENOMEM; return -ENOMEM;
...@@ -366,7 +363,7 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -366,7 +363,7 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* analog output subdevice */ /* analog output subdevice */
s->type = COMEDI_SUBD_AO; s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITABLE; s->subdev_flags = SDF_WRITABLE;
s->n_chan = thisboard->n_ao_chans; s->n_chan = board->n_ao_chans;
s->maxdata = (1 << 12) - 1; s->maxdata = (1 << 12) - 1;
if (ao_unipolar) if (ao_unipolar)
s->range_table = &range_unipolar10; s->range_table = &range_unipolar10;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment