mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] staging: comedi: remove check for CONFIG_KMOD
@ 2014-05-26 19:09 Paul Bolle
  0 siblings, 0 replies; only message in thread
From: Paul Bolle @ 2014-05-26 19:09 UTC (permalink / raw)
  To: Ian Abbott, H Hartley Sweeten, Greg Kroah-Hartman; +Cc: devel, linux-kernel

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>
---
Untested. Done on top of next-20140526.

 drivers/staging/comedi/comedi_fops.c | 8 --------
 1 file changed, 8 deletions(-)

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)) {
-- 
1.9.0


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-05-26 19:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-26 19:09 [PATCH] staging: comedi: remove check for CONFIG_KMOD Paul Bolle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®