Commit f30f2c2d authored May 26, 2014 by Paul Bolle Committed by Greg Kroah-Hartman May 26, 2014

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>

parent 464ae880

drivers/staging/comedi/comedi_fops.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -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)) {

Admin message