From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 14 May 2013 20:37:38 +0000 (-0700)
Subject: staging: comedi: usbduxfast: tidy up send_dux_commands()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=665ff8d3e968c08ea2f6a55bd1a71ac24c8d6d39;p=deliverable%2Flinux.git

staging: comedi: usbduxfast: tidy up send_dux_commands()

Rename this function so it has namespace associated with the driver.

For aesthetic reasons, rename the local variable 'tmp' to 'ret' as
this is more common for checking errno values.

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/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 102b24d80d82..dd7c53f2fd38 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -165,23 +165,24 @@ struct usbduxfast_private {
 #define SENDADCOMMANDS            0
 #define SENDINITEP6               1
 
-static int send_dux_commands(struct comedi_device *dev, int cmd_type)
+static int usbduxfast_send_cmd(struct comedi_device *dev, int cmd_type)
 {
 	struct usb_interface *intf = comedi_to_usb_interface(dev);
 	struct usb_device *usb = interface_to_usbdev(intf);
 	struct usbduxfast_private *devpriv = dev->private;
-	int tmp, nsent;
+	int nsent;
+	int ret;
 
 	devpriv->duxbuf[0] = cmd_type;
 
-	tmp = usb_bulk_msg(usb, usb_sndbulkpipe(usb, CHANNELLISTEP),
+	ret = usb_bulk_msg(usb, usb_sndbulkpipe(usb, CHANNELLISTEP),
 			   devpriv->duxbuf, SIZEOFDUXBUF,
 			   &nsent, 10000);
-	if (tmp < 0)
+	if (ret < 0)
 		dev_err(dev->class_dev,
 			"could not transmit command to the usb-device, err=%d\n",
-			tmp);
-	return tmp;
+			ret);
+	return ret;
 }
 
 /*
@@ -995,7 +996,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
 	}
 
 	/* 0 means that the AD commands are sent */
-	result = send_dux_commands(dev, SENDADCOMMANDS);
+	result = usbduxfast_send_cmd(dev, SENDADCOMMANDS);
 	if (result < 0) {
 		up(&devpriv->sem);
 		return result;
@@ -1115,7 +1116,7 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
 	devpriv->duxbuf[LOGBASE + 0] = 0;
 
 	/* 0 means that the AD commands are sent */
-	err = send_dux_commands(dev, SENDADCOMMANDS);
+	err = usbduxfast_send_cmd(dev, SENDADCOMMANDS);
 	if (err < 0) {
 		up(&devpriv->sem);
 		return err;