[PATCH v2] MIPS: don't use module_init in non-modular cobalt/mtd.c file

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Paul Gortmaker <paul.gortmaker@windriver.com>
Newsgroups	linux.kernel
Subject	[PATCH v2] MIPS: don't use module_init in non-modular cobalt/mtd.c file
Date	Tue, 16 Jun 2015 21:00:01 +0200
Message-ID	<pC4fv-2B3-3@gated-at.bofh.it> (permalink)
References	<pBKTw-8mo-23@gated-at.bofh.it>
X-Original-To	<linux-kernel@vger.kernel.org>
X-Mailer	git-send-email 2.2.1
MIME-Version	1.0
Content-Type	text/plain
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	53
Organization	linux.* mail to news gateway
X-Original-Cc	Paul Gortmaker <paul.gortmaker@windriver.com>, Ralf Baechle <ralf@linux-mips.org>, <linux-mips@linux-mips.org>
X-Original-Date	Tue, 16 Jun 2015 14:49:46 -0400
X-Original-Message-ID	<1434480586-18799-1-git-send-email-paul.gortmaker@windriver.com>
X-Original-References	<1434406281-32168-1-git-send-email-paul.gortmaker@windriver.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1166318

Show key headers only | View raw

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>
---

[
 v2: rebase from rc6 to rc8 so 34b1252 is present, and that changes
 the patch from being an implicit module.h user to a misleading
 module_init() user.

 To be appended to the branch content originally sent as:
 "Replace module_init with device_initcall in non modules"
 https://lkml.kernel.org/r/1432860493-23831-1-git-send-email-paul.gortmaker@windriver.com
]

 arch/mips/cobalt/mtd.c | 3 +--
 1 file changed, 1 insertion(+), 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);
-- 
2.2.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v2] MIPS: don't use module_init in non-modular cobalt/mtd.c file Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-06-16 21:00 +0200

csiph-web