summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2015-05-01 20:05:50 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2015-06-16 14:12:30 -0400
commitaed6850a1390c2b208b91b2fae0199fc14b94a26 (patch)
tree43a821bcacb182dddaa1b8861fd19b5ed9daf3eb
parent73de14e8cdc733bbc8eda006f813d5aa51511139 (diff)
downloadop-kernel-dev-aed6850a1390c2b208b91b2fae0199fc14b94a26.zip
op-kernel-dev-aed6850a1390c2b208b91b2fae0199fc14b94a26.tar.gz
parisc: don't use module_init for non-modular core pdc_cons code
The pdc_cons.c code is always built in. 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. Direct use of __initcall is discouraged, vs prioritized ones. Use of device_initcall is consistent with what __initcall maps onto, and hence does not change the init order, making the impact of this change zero. Should someone with real hardware for boot testing want to change it later to arch_initcall or something different, they can do that at a later date. Reported-by: kbuild test robot <fengguang.wu@intel.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Helge Deller <deller@gmx.de> Cc: linux-parisc@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--arch/parisc/kernel/pdc_cons.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c
index d5cae55..10a5ae9 100644
--- a/arch/parisc/kernel/pdc_cons.c
+++ b/arch/parisc/kernel/pdc_cons.c
@@ -207,8 +207,7 @@ static int __init pdc_console_tty_driver_init(void)
return 0;
}
-
-module_init(pdc_console_tty_driver_init);
+device_initcall(pdc_console_tty_driver_init);
static struct tty_driver * pdc_console_device (struct console *c, int *index)
{
OpenPOWER on IntegriCloud