Skip to content

Commit

Permalink
staging: comedi: usbdux: tidy up usbdux_pwm_stop()
Browse files Browse the repository at this point in the history
For aesthetic reasons, pass the comedi_device pointer to this function
instead of the private data pointer. Rename the local variable used
for the private data pointer to the comedi "norm".

Remove the unnecessary sanity check of the private data pointer. This
function can only be called is the private data was allocated during
the attach.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 26, 2013
1 parent f292961 commit 38f0683
Showing 1 changed file with 8 additions and 13 deletions.
21 changes: 8 additions & 13 deletions drivers/staging/comedi/drivers/usbdux.c
Original file line number Diff line number Diff line change
Expand Up @@ -1417,20 +1417,15 @@ static int usbduxsub_unlink_pwm_urbs(struct usbdux_private *usbduxsub_tmp)
return err;
}

/* This cancels a running acquisition operation
* in any context.
*/
static int usbdux_pwm_stop(struct usbdux_private *this_usbduxsub, int do_unlink)
static int usbdux_pwm_stop(struct comedi_device *dev, int do_unlink)
{
struct usbdux_private *devpriv = dev->private;
int ret = 0;

if (!this_usbduxsub)
return -EFAULT;

if (do_unlink)
ret = usbduxsub_unlink_pwm_urbs(this_usbduxsub);
ret = usbduxsub_unlink_pwm_urbs(devpriv);

this_usbduxsub->pwm_cmd_running = 0;
devpriv->pwm_cmd_running = 0;

return ret;
}
Expand All @@ -1443,7 +1438,7 @@ static int usbdux_pwm_cancel(struct comedi_device *dev,
int res = 0;

/* unlink only if it is really running */
res = usbdux_pwm_stop(this_usbduxsub, this_usbduxsub->pwm_cmd_running);
res = usbdux_pwm_stop(dev, this_usbduxsub->pwm_cmd_running);

return send_dux_commands(dev, SENDPWMOFF);
}
Expand All @@ -1468,7 +1463,7 @@ static void usbduxsub_pwm_irq(struct urb *urb)
* no unlink needed here. Already shutting down.
*/
if (devpriv->pwm_cmd_running)
usbdux_pwm_stop(devpriv, 0);
usbdux_pwm_stop(dev, 0);

return;

Expand All @@ -1478,7 +1473,7 @@ static void usbduxsub_pwm_irq(struct urb *urb)
dev_err(dev->class_dev,
"Non-zero urb status received in pwm intr context: %d\n",
urb->status);
usbdux_pwm_stop(devpriv, 0);
usbdux_pwm_stop(dev, 0);
}
return;
}
Expand All @@ -1501,7 +1496,7 @@ static void usbduxsub_pwm_irq(struct urb *urb)
"buggy USB host controller or bug in IRQ handling!\n");

/* don't do an unlink here */
usbdux_pwm_stop(devpriv, 0);
usbdux_pwm_stop(dev, 0);
}
}
}
Expand Down

0 comments on commit 38f0683

Please sign in to comment.