Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: comedi: dt9812: pass the comedi_device * to dt9812_analog_out_shadow() 



For aesthetic reasons, instead of passing the 'slot' pointer, pass the
comedi_device pointer to this function and rename the local var 'result'
to simply 'ret'.

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 387d4879

drivers/staging/comedi/drivers/dt9812.c

+8 −7
Original line number Diff line number Diff line
@@ -588,19 +588,21 @@ static int dt9812_analog_in(struct comedi_device *dev, 
	return ret;

}



static int dt9812_analog_out_shadow(struct slot_dt9812 *slot, int channel,

				    u16 *value)

static int dt9812_analog_out_shadow(struct comedi_device *dev,

				    int channel, u16 *value)

{

	int result = -ENODEV;

	struct dt9812_private *devpriv = dev->private;

	struct slot_dt9812 *slot = devpriv->slot;

	int ret = -ENODEV;



	down(&slot->mutex);

	if (slot->usb) {

		*value = slot->usb->analog_out_shadow[channel];

		result = 0;

		ret = 0;

	}

	up(&slot->mutex);



	return result;

	return ret;

}



static int dt9812_analog_out(struct comedi_device *dev, int channel, u16 value)
@@ -712,14 +714,13 @@ static int dt9812_ao_rinsn(struct comedi_device *dev, 
			   struct comedi_subdevice *s, struct comedi_insn *insn,

			   unsigned int *data)

{

	struct dt9812_private *devpriv = dev->private;

	unsigned int channel = CR_CHAN(insn->chanspec);

	int n;

	u16 value;



	for (n = 0; n < insn->n; n++) {

		value = 0;

		dt9812_analog_out_shadow(devpriv->slot, channel, &value);

		dt9812_analog_out_shadow(dev, channel, &value);

		data[n] = value;

	}

	return n;