From 90ac0764e01f310588e578d26f554cb0008b5091 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 21 Jul 2014 11:01:26 -0700 Subject: [PATCH] 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- 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 01fb31d7f3cd..84a1e429f24c 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; } -- 2.39.5