From 7a5bd23d9e91a5d410c9fe9a449464efe69ccf03 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Tue, 9 Sep 2014 11:26:27 +0100 Subject: [PATCH] staging: comedi: das16: 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 --- drivers/staging/comedi/drivers/das16.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index aa52a5b83c43..baec9f2bd43c 100644 --- a/drivers/staging/comedi/drivers/das16.c +++ b/drivers/staging/comedi/drivers/das16.c @@ -631,7 +631,7 @@ static int das16_ai_check_chanlist(struct comedi_device *dev, static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd) { - const struct das16_board *board = comedi_board(dev); + const struct das16_board *board = dev->board_ptr; struct das16_private_struct *devpriv = dev->private; int err = 0; unsigned int trig_mask; @@ -748,7 +748,7 @@ static unsigned int das16_set_pacer(struct comedi_device *dev, unsigned int ns, static int das16_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s) { - const struct das16_board *board = comedi_board(dev); + const struct das16_board *board = dev->board_ptr; struct das16_private_struct *devpriv = dev->private; struct comedi_async *async = s->async; struct comedi_cmd *cmd = &async->cmd; @@ -883,7 +883,7 @@ static int das16_ai_insn_read(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { - const struct das16_board *board = comedi_board(dev); + const struct das16_board *board = dev->board_ptr; unsigned int chan = CR_CHAN(insn->chanspec); unsigned int range = CR_RANGE(insn->chanspec); unsigned int val; @@ -968,7 +968,7 @@ static int das16_do_insn_bits(struct comedi_device *dev, static int das16_probe(struct comedi_device *dev, struct comedi_devconfig *it) { - const struct das16_board *board = comedi_board(dev); + const struct das16_board *board = dev->board_ptr; int diobits; /* diobits indicates boards */ @@ -993,7 +993,7 @@ static void das16_reset(struct comedi_device *dev) static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it) { - const struct das16_board *board = comedi_board(dev); + const struct das16_board *board = dev->board_ptr; struct das16_private_struct *devpriv; struct comedi_subdevice *s; struct comedi_lrange *lrange; @@ -1219,7 +1219,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it) static void das16_detach(struct comedi_device *dev) { - const struct das16_board *board = comedi_board(dev); + const struct das16_board *board = dev->board_ptr; struct das16_private_struct *devpriv = dev->private; int i; -- 2.34.1