diff options
| author | Greg Dietsche <Gregory.Dietsche@cuw.edu> | 2011-06-13 13:11:47 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-28 13:13:42 -0700 |
| commit | c5274ab09747d0ef829f9b8f040756758e5de55c (patch) | |
| tree | a73921f526439db68b492eab9c196b5de84f6373 /drivers/staging/comedi | |
| parent | 9996059d8bab60635ab662c23d85222af5402ced (diff) | |
| download | blackbird-op-linux-c5274ab09747d0ef829f9b8f040756758e5de55c.tar.gz blackbird-op-linux-c5274ab09747d0ef829f9b8f040756758e5de55c.zip | |
staging: remove unnecessary code
Compile tested.
remove unnecessary code that matches this coccinelle pattern
if (...)
return ret;
return ret;
Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Acked-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/usbdux.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index e7e72b8d8cde..15a209f5b486 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -1291,10 +1291,10 @@ static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg, s->lock = file; spin_unlock_irqrestore(&s->spin_lock, flags); +#if 0 if (ret < 0) return ret; -#if 0 if (s->lock_f) ret = s->lock_f(dev, s); #endif diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c index 1d09bfa2edf5..6637698e119a 100644 --- a/drivers/staging/comedi/drivers/usbdux.c +++ b/drivers/staging/comedi/drivers/usbdux.c @@ -1935,11 +1935,8 @@ static int usbdux_pwm_cancel(struct comedi_device *dev, dev_dbg(&this_usbduxsub->interface->dev, "comedi %d: sending pwm off command to the usb device.\n", dev->minor); - res = send_dux_commands(this_usbduxsub, SENDPWMOFF); - if (res < 0) - return res; - return res; + return send_dux_commands(this_usbduxsub, SENDPWMOFF); } static void usbduxsub_pwm_irq(struct urb *urb) |
