evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: usbduxfast: tidy up send_dux_commands()

Browse source 
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>
This commit is contained in:
H Hartley Sweeten 2013-05-14 13:37:38 -07:00 • committed by Greg Kroah-Hartman
parent 3056b10516
commit 665ff8d3e9
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/staging/comedi/drivers/usbduxfast.c
View file

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