summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/comedi_fops.c
diff options
context:
space:
mode:
authorKinka Huang2014-07-15 17:11:02 +0200
committerGreg Kroah-Hartman2014-07-16 04:59:16 +0200
commitcb3aadaec89109edb60d4829ce82e50b27cb4ce6 (patch)
treee5c19050f6b24be96f30fe1eca3bf4a1cfec192a /drivers/staging/comedi/comedi_fops.c
parentstaging: vt6656: usbpipe irrelevant function descriptions (diff)
downloadkernel-qcow2-linux-cb3aadaec89109edb60d4829ce82e50b27cb4ce6.tar.gz
kernel-qcow2-linux-cb3aadaec89109edb60d4829ce82e50b27cb4ce6.tar.xz
kernel-qcow2-linux-cb3aadaec89109edb60d4829ce82e50b27cb4ce6.zip
staging: comedi: removing not useful `else` after return
Signed-off-by: Kinka Huang <kinkabrain@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/comedi_fops.c')
-rw-r--r--drivers/staging/comedi/comedi_fops.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 038b69a93185..36862965051b 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -206,8 +206,8 @@ struct comedi_device *comedi_dev_get_from_minor(unsigned minor)
{
if (minor < COMEDI_NUM_BOARD_MINORS)
return comedi_dev_get_from_board_minor(minor);
- else
- return comedi_dev_get_from_subdevice_minor(minor);
+
+ return comedi_dev_get_from_subdevice_minor(minor);
}
EXPORT_SYMBOL_GPL(comedi_dev_get_from_minor);
@@ -2625,10 +2625,9 @@ static int __init comedi_init(void)
unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
COMEDI_NUM_MINORS);
return PTR_ERR(dev);
- } else {
- /* comedi_alloc_board_minor() locked the mutex */
- mutex_unlock(&dev->mutex);
}
+ /* comedi_alloc_board_minor() locked the mutex */
+ mutex_unlock(&dev->mutex);
}
return 0;