summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2013-01-26 01:37:41 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-30 04:09:25 (GMT)
commit6e4733c34fd344fe17c7f6f8bd340d116f5377ec (patch)
tree43050e0b5ea47386831f2871a08d279fa9a40d50
parent6749ffa84028b5283889eb68b9bbec2e27049722 (diff)
downloadlinux-6e4733c34fd344fe17c7f6f8bd340d116f5377ec.tar.xz
staging: comedi: ni_labpc_cs: 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_labpc_cs.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 669894c..6c6ca40 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -108,13 +108,9 @@ static const struct labpc_board_struct labpc_cs_boards[] = {
},
};
-/*
- * Useful for shorthand access to the particular board structure
- */
-#define thisboard ((const struct labpc_board_struct *)dev->board_ptr)
-
static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
+ const struct labpc_board_struct *thisboard = comedi_board(dev);
struct labpc_private *devpriv;
unsigned long iobase = 0;
unsigned int irq = 0;