From 6e4733c34fd344fe17c7f6f8bd340d116f5377ec Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 25 Jan 2013 18:37:41 -0700 Subject: [PATCH] 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_labpc_cs.c | 6 +----- 1 file changed, 1 insertion(+), 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; -- 2.7.4