staging: comedi: remove check for CONFIG_KMOD

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>

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 012c8fd1aabbfe2c1463b7aa3f75e822e756ac49..70ad00c501ef58f154a1221738a5393866216bf8 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2351,14 +2351,6 @@ static int comedi_open(struct inode *inode, struct file *file)
        if (capable(CAP_NET_ADMIN) && dev->in_request_module)
                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;
 
        if (!dev->attached && !capable(CAP_NET_ADMIN)) {