Skip to content

Commit

Permalink
MIPS: Cobalt Don't use module_init in non-modular MTD registration.
Browse files Browse the repository at this point in the history
As of commit 34b1252 ("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>
  • Loading branch information
Paul Gortmaker authored and Ralf Baechle committed Jun 21, 2015
1 parent f6e734a commit 589de41
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions arch/mips/cobalt/mtd.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,4 @@ static int __init cobalt_mtd_init(void)

return 0;
}

module_init(cobalt_mtd_init);
device_initcall(cobalt_mtd_init);

0 comments on commit 589de41

Please sign in to comment.