summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2015-06-16 20:49:46 +0200
committerRalf Baechle <ralf@linux-mips.org>2015-06-21 22:14:30 +0200
commit589de416fb07aaea94d27f71c31a9bb02af2e54c (patch)
tree15e78b0affcdded883d47d5ed4ddbb7ddc14eba8
parentMIPS: BCM47xx: Move NVRAM driver to the drivers/firmware/ (diff)
downloadlinux-589de416fb07aaea94d27f71c31a9bb02af2e54c.tar.xz
linux-589de416fb07aaea94d27f71c31a9bb02af2e54c.zip
MIPS: Cobalt Don't use module_init in non-modular MTD registration.
As of commit 34b1252bd91851f77f89fbb6829a04efad900f41 ("MIPS: Cobalt: Do not build MTD platform device registration code as module.") this file became built-in instead of modular. So we should also stop using module_init as an alias for __initcall as that can be 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. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/10549/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/cobalt/mtd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/cobalt/mtd.c b/arch/mips/cobalt/mtd.c
index 8db7b5d81560..83e1b1093d5f 100644
--- a/arch/mips/cobalt/mtd.c
+++ b/arch/mips/cobalt/mtd.c
@@ -57,5 +57,4 @@ static int __init cobalt_mtd_init(void)
return 0;
}
-
-module_init(cobalt_mtd_init);
+device_initcall(cobalt_mtd_init);