iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: remove check for CONFIG_KMOD

Browse Source 
The comedi driver was added in v2.6.29. That's the same release that
removed the Kconfig symbol KMOD. So the code behind a test for its
macro has been hidden since it was in staging. Remove it.

Remove a useless assignment to "dev->in_request_module" too. That
variable seems pointless anyhow, but that's a different issue.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Paul Bolle 2014-05-26 21:09:10 +02:00 committed by Greg Kroah-Hartman
parent 464ae880a3
commit f30f2c2d41
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/comedi_fops.c
View File

@ -2351,14 +2351,6 @@ static int comedi_open(struct inode *inode, struct file *file)
if (capable(CAP_NET_ADMIN) && dev->in_request_module) if (capable(CAP_NET_ADMIN) && dev->in_request_module)
goto ok; goto ok;
dev->in_request_module = true;
#ifdef CONFIG_KMOD
mutex_unlock(&dev->mutex);
request_module("char-major-%i-%i", COMEDI_MAJOR, dev->minor);
mutex_lock(&dev->mutex);
#endif
dev->in_request_module = false; dev->in_request_module = false;
if (!dev->attached && !capable(CAP_NET_ADMIN)) { if (!dev->attached && !capable(CAP_NET_ADMIN)) {