Commit b7793094 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

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: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19924ce0
...@@ -248,7 +248,7 @@ static unsigned das800_ind_read(struct comedi_device *dev, unsigned reg) ...@@ -248,7 +248,7 @@ static unsigned das800_ind_read(struct comedi_device *dev, unsigned reg)
static void das800_enable(struct comedi_device *dev) 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; struct das800_private *devpriv = dev->private;
unsigned long irq_flags; unsigned long irq_flags;
...@@ -325,7 +325,7 @@ static int das800_ai_do_cmdtest(struct comedi_device *dev, ...@@ -325,7 +325,7 @@ static int das800_ai_do_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_cmd *cmd) 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; struct das800_private *devpriv = dev->private;
int err = 0; int err = 0;
unsigned int arg; unsigned int arg;
...@@ -398,7 +398,7 @@ static int das800_ai_do_cmdtest(struct comedi_device *dev, ...@@ -398,7 +398,7 @@ static int das800_ai_do_cmdtest(struct comedi_device *dev,
static int das800_ai_do_cmd(struct comedi_device *dev, static int das800_ai_do_cmd(struct comedi_device *dev,
struct comedi_subdevice *s) 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 das800_private *devpriv = dev->private;
struct comedi_async *async = s->async; struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd; struct comedi_cmd *cmd = &async->cmd;
...@@ -633,7 +633,7 @@ static int das800_do_insn_bits(struct comedi_device *dev, ...@@ -633,7 +633,7 @@ static int das800_do_insn_bits(struct comedi_device *dev,
static int das800_probe(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 board = thisboard ? thisboard - das800_boards : -EINVAL;
int id_bits; int id_bits;
unsigned long irq_flags; unsigned long irq_flags;
...@@ -695,7 +695,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -695,7 +695,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -ENODEV; return -ENODEV;
} }
dev->board_ptr = das800_boards + board; dev->board_ptr = das800_boards + board;
thisboard = comedi_board(dev); thisboard = dev->board_ptr;
dev->board_name = thisboard->name; dev->board_name = thisboard->name;
if (irq > 1 && irq <= 7) { if (irq > 1 && irq <= 7) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment