forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: usbduxsigma: cleanup the stop functions

Browse source 
The 'this_usbduxsub' parameter is actually the comedi_device private data,
rename it to 'devpriv' which is more common in comedi drivers.

Remove the unnecessary pr_err() noise in usbdux_ai_stop().

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-23 12:40:10 -07:00 • committed by Greg Kroah-Hartman
commit 19d61fd250
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
drivers/staging/comedi/drivers/usbduxsigma.c
View file

@ -262,17 +262,15 @@ static void usbduxsub_unlink_InURBs(struct usbduxsub *devpriv)
}
}
static int usbdux_ai_stop(struct usbduxsub *this_usbduxsub, int do_unlink)
static int usbdux_ai_stop(struct usbduxsub *devpriv, int do_unlink)
{
if (!this_usbduxsub) {
pr_err("comedi?: usbdux_ai_stop: this_usbduxsub=NULL!\n");
if (!devpriv)
return -EFAULT;
}
if (do_unlink)
usbduxsub_unlink_InURBs(this_usbduxsub);
usbduxsub_unlink_InURBs(devpriv);
this_usbduxsub->ai_cmd_running = 0;
devpriv->ai_cmd_running = 0;
return 0;
}
@ -459,15 +457,15 @@ static void usbduxsub_unlink_OutURBs(struct usbduxsub *devpriv)
}
}
static int usbdux_ao_stop(struct usbduxsub *this_usbduxsub, int do_unlink)
static int usbdux_ao_stop(struct usbduxsub *devpriv, int do_unlink)
{
if (!this_usbduxsub)
if (!devpriv)
return -EFAULT;
if (do_unlink)
usbduxsub_unlink_OutURBs(this_usbduxsub);
usbduxsub_unlink_OutURBs(devpriv);
this_usbduxsub->ao_cmd_running = 0;
devpriv->ao_cmd_running = 0;
return 0;
}
@ -1639,15 +1637,15 @@ static void usbduxsub_unlink_PwmURBs(struct usbduxsub *devpriv)
usb_kill_urb(devpriv->urbPwm);
}
static int usbdux_pwm_stop(struct usbduxsub *this_usbduxsub, int do_unlink)
static int usbdux_pwm_stop(struct usbduxsub *devpriv, int do_unlink)
{
if (!this_usbduxsub)
if (!devpriv)
return -EFAULT;
if (do_unlink)
usbduxsub_unlink_PwmURBs(this_usbduxsub);
usbduxsub_unlink_PwmURBs(devpriv);
this_usbduxsub->pwm_cmd_running = 0;
devpriv->pwm_cmd_running = 0;
return 0;
}