path: root/drivers/char
diff options
authorPaul Gortmaker <paul.gortmaker@windriver.com>2014-01-12 12:37:56 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-13 14:57:20 -0800
commitdb50d2f65b7c2bcdfb931dfa18cdcb4bb75dcfaa (patch)
treee2f8320a89b9ffcafe2ab45e7130d43c33a1d801 /drivers/char
parent782f24453536460482f9dd14d3677ade910b1fd1 (diff)
drivers/char: don't use module_init in non-modular ttyprintk.c
The TTY_PRINTK option is bool, and hence this code is either present or absent. It will never be modular, so using module_init as an alias for __initcall is rather misleading. Fix this up now, so that we can relocate module_init from init.h into module.h in the future. If we don't do this, we'd have to add module.h to obviously non-modular code, and that would be a worse thing. Note that direct use of __initcall is discouraged, vs. one of the priority categorized subgroups. As __initcall gets mapped onto device_initcall, our use of device_initcall directly in this change means that the runtime impact is zero -- it will remain at level 6 in initcall ordering. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index d5d2e4a985aa..daea84c41743 100644
--- a/drivers/char/ttyprintk.c
+++ b/drivers/char/ttyprintk.c
@@ -216,4 +216,4 @@ error:
ttyprintk_driver = NULL;
return ret;