From: Paul Bolle Date: Mon, 26 May 2014 19:09:10 +0000 (+0200) Subject: staging: comedi: remove check for CONFIG_KMOD X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f30f2c2d417b9de3d967016ade0bea2d93190624;p=linux-beck.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 012c8fd1aabb..70ad00c501ef 100644 --- 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)) {