From: Ian Abbott Date: Tue, 9 Sep 2014 10:26:38 +0000 (+0100) Subject: staging: comedi: ni_at_a2150: replace comedi_board() calls X-Git-Tag: firefly_0821_release~176^2~3121^2~564 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=02cf9703e183424c0a1766b9581daa433ce342d2;p=firefly-linux-kernel-4.4.55.git staging: comedi: ni_at_a2150: replace comedi_board() calls The `comedi_board(dev)` inline function calls just return `dev->board_ptr`. Expand the inline function calls. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c index d4904907bb89..72ec857d073e 100644 --- a/drivers/staging/comedi/drivers/ni_at_a2150.c +++ b/drivers/staging/comedi/drivers/ni_at_a2150.c @@ -287,7 +287,7 @@ static int a2150_cancel(struct comedi_device *dev, struct comedi_subdevice *s) static int a2150_get_timing(struct comedi_device *dev, unsigned int *period, unsigned int flags) { - const struct a2150_board *thisboard = comedi_board(dev); + const struct a2150_board *thisboard = dev->board_ptr; struct a2150_private *devpriv = dev->private; int lub, glb, temp; int lub_divisor_shift, lub_index, glb_divisor_shift, glb_index; @@ -436,7 +436,7 @@ static int a2150_ai_check_chanlist(struct comedi_device *dev, 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); + const struct a2150_board *thisboard = dev->board_ptr; int err = 0; unsigned int arg; @@ -710,7 +710,7 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it) return -ENODEV; dev->board_ptr = a2150_boards + i; - thisboard = comedi_board(dev); + thisboard = dev->board_ptr; dev->board_name = thisboard->name; if ((irq >= 3 && irq <= 7) || (irq >= 9 && irq <= 12) ||