diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-06-15 09:56:26 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-06-16 14:34:36 -0400 |
| commit | b0c6d93014c8f2f53b70e9362b9fbec13b8e3aa0 (patch) | |
| tree | 0ef22cc7b484f751f0470b9e6d49d01ed02f9b5a | |
| parent | 33d69ca12b44ef3c7be8f948ffa5a35652e1f2ff (diff) | |
| download | linux-b0c6d93014c8f2f53b70e9362b9fbec13b8e3aa0.tar.bz2 | |
MIPS: don't use module_init in non-modular cobalt/mtd.c file
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.
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | arch/mips/cobalt/mtd.c | 3 |
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); |