From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 8 Jul 2008 17:00:18 +0000 (+0200)
Subject: rework try_then_request_module to do less in non-modular kernels
X-Git-Tag: v2.6.27-rc1~864^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=df648c9fbebb4de50e7a6e76cc253c7cb0421f9b;p=linux-2.6-omap-h63xx.git

rework try_then_request_module to do less in non-modular kernels

This reworks try_then_request_module to only invoke the "lookup"
function "x" once when the kernel is not modular.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 5dc13848891..9bdb28d6660 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -29,11 +29,12 @@
 /* modprobe exit status on success, -ve on error.  Return value
  * usually useless though. */
 extern int request_module(const char * name, ...) __attribute__ ((format (printf, 1, 2)));
+#define try_then_request_module(x, mod...) ((x) ?: (request_module(mod), (x)))
 #else
 static inline int request_module(const char * name, ...) { return -ENOSYS; }
+#define try_then_request_module(x, mod...) (x)
 #endif
 
-#define try_then_request_module(x, mod...) ((x) ?: (request_module(mod), (x)))
 
 struct key;
 struct file;