From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754785AbbFPSuR (ORCPT ); Tue, 16 Jun 2015 14:50:17 -0400 Received: from mail1.windriver.com ([147.11.146.13]:52019 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750838AbbFPSuK (ORCPT ); Tue, 16 Jun 2015 14:50:10 -0400 From: Paul Gortmaker To: CC: Paul Gortmaker , Ralf Baechle , Subject: [PATCH v2] MIPS: don't use module_init in non-modular cobalt/mtd.c file Date: Tue, 16 Jun 2015 14:49:46 -0400 Message-ID: <1434480586-18799-1-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1434406281-32168-1-git-send-email-paul.gortmaker@windriver.com> References: <1434406281-32168-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: linux-mips@linux-mips.org Signed-off-by: Paul Gortmaker --- [ 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