diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-07-21 11:01:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-22 15:33:23 -0700 |
| commit | 90ac0764e01f310588e578d26f554cb0008b5091 (patch) | |
| tree | 75492123f5ec5dee622ca2bc1942d65c77999870 | |
| parent | 7a43ba4221aba096aedda5bf136c4b767d335c9b (diff) | |
| download | op-kernel-dev-90ac0764e01f310588e578d26f554cb0008b5091.zip op-kernel-dev-90ac0764e01f310588e578d26f554cb0008b5091.tar.gz | |
staging: comedi: comedi_fops: remove disabled subdevice lock/unlock callback
According to Ian Abbott, this code was added in comedi-0.7.6 back in June 1999
and has always been disabled.
The 'lock_f' and 'unlock' members don't even exist in the comedi_subdevice.
Just remove the disabled code.
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>
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 01fb31d..84a1e42 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -1660,14 +1660,6 @@ 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 (s->lock_f) - ret = s->lock_f(dev, s); -#endif - return ret; } @@ -1702,14 +1694,8 @@ static int do_unlock_ioctl(struct comedi_device *dev, unsigned int arg, if (s->lock && s->lock != file) return -EACCES; - if (s->lock == file) { -#if 0 - if (s->unlock) - s->unlock(dev, s); -#endif - + if (s->lock == file) s->lock = NULL; - } return 0; } |
