Commit 90ac0764 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7a43ba42
...@@ -1660,14 +1660,6 @@ static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg, ...@@ -1660,14 +1660,6 @@ static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg,
s->lock = file; s->lock = file;
spin_unlock_irqrestore(&s->spin_lock, flags); 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; return ret;
} }
...@@ -1702,14 +1694,8 @@ static int do_unlock_ioctl(struct comedi_device *dev, unsigned int arg, ...@@ -1702,14 +1694,8 @@ static int do_unlock_ioctl(struct comedi_device *dev, unsigned int arg,
if (s->lock && s->lock != file) if (s->lock && s->lock != file)
return -EACCES; return -EACCES;
if (s->lock == file) { if (s->lock == file)
#if 0
if (s->unlock)
s->unlock(dev, s);
#endif
s->lock = NULL; s->lock = NULL;
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment