From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 14 May 2013 21:27:16 +0000 (-0700)
Subject: staging: comedi: dt9812: pass the comedi_device * to dt9812_analog_out_shadow()
X-Git-Tag: firefly_0821_release~176^2~5845^2~622
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fad1c32076ae8b82c7b62be5946f98596f7febeb;p=firefly-linux-kernel-4.4.55.git

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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c
index ac5629c1a7d0..94ab0c57eb3d 100644
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -588,19 +588,21 @@ exit:
 	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;