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

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

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'.

Also, initialize the 'reg', and 'value' when they are declared.

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 8bd773a15496..96a1d860c1eb 100644
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -411,23 +411,23 @@ static int dt9812_digital_in(struct comedi_device *dev, u8 *bits)
 	return ret;
 }
 
-static int dt9812_digital_out(struct slot_dt9812 *slot, u8 bits)
+static int dt9812_digital_out(struct comedi_device *dev, u8 bits)
 {
-	int result = -ENODEV;
+	struct dt9812_private *devpriv = dev->private;
+	struct slot_dt9812 *slot = devpriv->slot;
+	int ret = -ENODEV;
 
 	down(&slot->mutex);
 	if (slot->usb) {
-		u8 reg[1];
-		u8 value[1];
+		u8 reg[1] = { F020_SFR_P2 };
+		u8 value[1] = { bits };
 
-		reg[0] = F020_SFR_P2;
-		value[0] = bits;
-		result = dt9812_write_multiple_registers(slot->usb, 1, reg,
-							 value);
+		ret = dt9812_write_multiple_registers(slot->usb, 1, reg, value);
 		slot->usb->digital_out_shadow = bits;
 	}
 	up(&slot->mutex);
-	return result;
+
+	return ret;
 }
 
 static int dt9812_digital_out_shadow(struct slot_dt9812 *slot, u8 *bits)
@@ -671,7 +671,7 @@ static int dt9812_do_winsn(struct comedi_device *dev,
 		if (data[n])
 			bits |= mask;
 	}
-	dt9812_digital_out(devpriv->slot, bits);
+	dt9812_digital_out(dev, bits);
 	return n;
 }