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 <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/staging/comedi/comedi_fops.c | 16 +---------------
1 file changed, 1 insertion(+), 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;
}
--
1.9.3
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
