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

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

drivers/staging/comedi/drivers/das1800.c

+6 −6
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ static const struct comedi_lrange range_ao_2 = { 
static inline uint16_t munge_bipolar_sample(const struct comedi_device *dev,

					    uint16_t sample)

{

	const struct das1800_board *thisboard = comedi_board(dev);

	const struct das1800_board *thisboard = dev->board_ptr;



	sample += 1 << (thisboard->resolution - 1);

	return sample;
@@ -773,7 +773,7 @@ static int das1800_ai_do_cmdtest(struct comedi_device *dev, 
				 struct comedi_subdevice *s,

				 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;

	int err = 0;

	unsigned int arg;
@@ -1136,7 +1136,7 @@ static int das1800_ai_rinsn(struct comedi_device *dev, 
			    struct comedi_subdevice *s,

			    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 chan, range, aref, chan_range;

	int timeout = 1000;
@@ -1200,7 +1200,7 @@ static int das1800_ao_winsn(struct comedi_device *dev, 
			    struct comedi_subdevice *s,

			    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;

	int chan = CR_CHAN(insn->chanspec);

/* int range = CR_RANGE(insn->chanspec); */
@@ -1329,7 +1329,7 @@ static int das1800_init_dma(struct comedi_device *dev, unsigned int dma0, 


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 id;
@@ -1412,7 +1412,7 @@ static int das1800_attach(struct comedi_device *dev, 
	}



	dev->board_ptr = das1800_boards + board;

	thisboard = comedi_board(dev);

	thisboard = dev->board_ptr;

	dev->board_name = thisboard->name;



	/*  if it is an 'ao' board with fancy analog out then we need extra io ports */