diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-01-30 16:45:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-03 19:27:37 -0600 |
| commit | fb89942cb3bff23a3bf8b799ae6f255a137eb775 (patch) | |
| tree | 0c7491ccae796ecc0b6de640a9dd6b9585d15c21 | |
| parent | 25602bd7350dc180128376db9772277818f041f2 (diff) | |
staging: comedi: ni_daq_dio24: remove thisboard macro
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 a local variable 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>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_dio24.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index acfef6e85a01..4982cc70c3ee 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c @@ -83,11 +83,6 @@ static const struct dio24_board_struct dio24_boards[] = { }, }; -/* - * Useful for shorthand access to the particular board structure - */ -#define thisboard ((const struct dio24_board_struct *)dev->board_ptr) - struct dio24_private { int data; /* number of data points left to be taken */ @@ -95,6 +90,7 @@ struct dio24_private { static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it) { + const struct dio24_board_struct *thisboard = comedi_board(dev); struct dio24_private *devpriv; struct comedi_subdevice *s; unsigned long iobase = 0; @@ -159,6 +155,7 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it) static void dio24_detach(struct comedi_device *dev) { + const struct dio24_board_struct *thisboard = comedi_board(dev); struct comedi_subdevice *s; if (dev->subdevices) { |