From 30566f6fb8cb6d948652c1ab6b7d74f79c38ab91 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 5 Apr 2013 17:36:40 -0700 Subject: [PATCH] --- yaml --- r: 363953 b: refs/heads/master c: e8e1560a02a46b06071433d2478452985076f35f h: refs/heads/master i: 363951: c3ce27c2c933c54c34f02c78d0caa552e92297c7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_at_a2150.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0d1c3f2710e9..bd98802361da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a56ec2fe6657984f84e419355e6451460ffb44ce +refs/heads/master: e8e1560a02a46b06071433d2478452985076f35f diff --git a/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c b/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c index 2a4a7a472142..974704f1f9c0 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c +++ b/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c @@ -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 */ @@ -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; @@ -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; @@ -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]; @@ -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);