Commit b436356d authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: cb_pcidas: cleanup dac08_write() 



Reverse the logic of the test against the cached value so that
the function only has one exit point.

Make the logic of the dac write a bit clearer by create a local
variable for the address used in the outw() calls and masking the
value to write and setting the enable bits before doing the outw()
calls. Add a comment just to make sure it's clear.

Also, add a comment about the 'return 1;'.  This should be
insn->n which is the number of data parameters used to do the
dac08_write_insn() but the insn is not a parameter to this
function.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f66faa57

drivers/staging/comedi/drivers/cb_pcidas.c

+15 −13
Original line number Diff line number Diff line
@@ -662,23 +662,25 @@ static int caldac_read_insn(struct comedi_device *dev, 
static int dac08_write(struct comedi_device *dev, unsigned int value)

{

	struct cb_pcidas_private *devpriv = dev->private;

	unsigned long cal_reg;



	if (devpriv->dac08_value == value)

		return 1;



	if (devpriv->dac08_value != value) {

		devpriv->dac08_value = value;



	outw(cal_enable_bits(dev) | (value & 0xff),

	     devpriv->control_status + CALIBRATION_REG);

		cal_reg = devpriv->control_status + CALIBRATION_REG;



		value &= 0xff;

		value |= cal_enable_bits(dev);



		/* latch the new value into the caldac */

		outw(value, cal_reg);

		udelay(1);

	outw(cal_enable_bits(dev) | SELECT_DAC08_BIT | (value & 0xff),

	     devpriv->control_status + CALIBRATION_REG);

		outw(value | SELECT_DAC08_BIT, cal_reg);

		udelay(1);

	outw(cal_enable_bits(dev) | (value & 0xff),

	     devpriv->control_status + CALIBRATION_REG);

		outw(value, cal_reg);

		udelay(1);



	return 1;

	}

	return 1;	/* insn->n */

}



static int dac08_write_insn(struct comedi_device *dev,