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

staging: comedi: das1800: 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 7a5bd23d
...@@ -453,7 +453,7 @@ static const struct comedi_lrange range_ao_2 = { ...@@ -453,7 +453,7 @@ static const struct comedi_lrange range_ao_2 = {
static inline uint16_t munge_bipolar_sample(const struct comedi_device *dev, static inline uint16_t munge_bipolar_sample(const struct comedi_device *dev,
uint16_t sample) uint16_t sample)
{ {
const struct das1800_board *thisboard = comedi_board(dev); const struct das1800_board *thisboard = dev->board_ptr;
sample += 1 << (thisboard->resolution - 1); sample += 1 << (thisboard->resolution - 1);
return sample; return sample;
...@@ -773,7 +773,7 @@ static int das1800_ai_do_cmdtest(struct comedi_device *dev, ...@@ -773,7 +773,7 @@ static int das1800_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 das1800_board *thisboard = comedi_board(dev); const struct das1800_board *thisboard = dev->board_ptr;
struct das1800_private *devpriv = dev->private; struct das1800_private *devpriv = dev->private;
int err = 0; int err = 0;
unsigned int arg; unsigned int arg;
...@@ -1136,7 +1136,7 @@ static int das1800_ai_rinsn(struct comedi_device *dev, ...@@ -1136,7 +1136,7 @@ static int das1800_ai_rinsn(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
const struct das1800_board *thisboard = comedi_board(dev); const struct das1800_board *thisboard = dev->board_ptr;
int i, n; int i, n;
int chan, range, aref, chan_range; int chan, range, aref, chan_range;
int timeout = 1000; int timeout = 1000;
...@@ -1200,7 +1200,7 @@ static int das1800_ao_winsn(struct comedi_device *dev, ...@@ -1200,7 +1200,7 @@ static int das1800_ao_winsn(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
const struct das1800_board *thisboard = comedi_board(dev); const struct das1800_board *thisboard = dev->board_ptr;
struct das1800_private *devpriv = dev->private; struct das1800_private *devpriv = dev->private;
int chan = CR_CHAN(insn->chanspec); int chan = CR_CHAN(insn->chanspec);
/* int range = CR_RANGE(insn->chanspec); */ /* int range = CR_RANGE(insn->chanspec); */
...@@ -1329,7 +1329,7 @@ static int das1800_init_dma(struct comedi_device *dev, unsigned int dma0, ...@@ -1329,7 +1329,7 @@ static int das1800_init_dma(struct comedi_device *dev, unsigned int dma0,
static int das1800_probe(struct comedi_device *dev) static int das1800_probe(struct comedi_device *dev)
{ {
const struct das1800_board *board = comedi_board(dev); const struct das1800_board *board = dev->board_ptr;
int index; int index;
int id; int id;
...@@ -1412,7 +1412,7 @@ static int das1800_attach(struct comedi_device *dev, ...@@ -1412,7 +1412,7 @@ static int das1800_attach(struct comedi_device *dev,
} }
dev->board_ptr = das1800_boards + board; dev->board_ptr = das1800_boards + board;
thisboard = comedi_board(dev); thisboard = dev->board_ptr;
dev->board_name = thisboard->name; dev->board_name = thisboard->name;
/* if it is an 'ao' board with fancy analog out then we need extra io ports */ /* if it is an 'ao' board with fancy analog out then we need extra io ports */
......
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