From b77930940d2a3b9d69cbe1b637159bab6a1ade25 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Tue, 9 Sep 2014 11:26:30 +0100 Subject: [PATCH] staging: comedi: das800: 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/das800.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c index cbbb29797b83..d75e5528258c 100644 --- a/drivers/staging/comedi/drivers/das800.c +++ b/drivers/staging/comedi/drivers/das800.c @@ -248,7 +248,7 @@ static unsigned das800_ind_read(struct comedi_device *dev, unsigned reg) static void das800_enable(struct comedi_device *dev) { - const struct das800_board *thisboard = comedi_board(dev); + const struct das800_board *thisboard = dev->board_ptr; struct das800_private *devpriv = dev->private; unsigned long irq_flags; @@ -325,7 +325,7 @@ static int das800_ai_do_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd) { - const struct das800_board *thisboard = comedi_board(dev); + const struct das800_board *thisboard = dev->board_ptr; struct das800_private *devpriv = dev->private; int err = 0; unsigned int arg; @@ -398,7 +398,7 @@ static int das800_ai_do_cmdtest(struct comedi_device *dev, static int das800_ai_do_cmd(struct comedi_device *dev, struct comedi_subdevice *s) { - const struct das800_board *thisboard = comedi_board(dev); + const struct das800_board *thisboard = dev->board_ptr; struct das800_private *devpriv = dev->private; struct comedi_async *async = s->async; struct comedi_cmd *cmd = &async->cmd; @@ -633,7 +633,7 @@ static int das800_do_insn_bits(struct comedi_device *dev, static int das800_probe(struct comedi_device *dev) { - const struct das800_board *thisboard = comedi_board(dev); + const struct das800_board *thisboard = dev->board_ptr; int board = thisboard ? thisboard - das800_boards : -EINVAL; int id_bits; unsigned long irq_flags; @@ -695,7 +695,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it) return -ENODEV; } dev->board_ptr = das800_boards + board; - thisboard = comedi_board(dev); + thisboard = dev->board_ptr; dev->board_name = thisboard->name; if (irq > 1 && irq <= 7) {