From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754693AbcFQAkj (ORCPT ); Thu, 16 Jun 2016 20:40:39 -0400 Received: from mail5.windriver.com ([192.103.53.11]:49574 "EHLO mail5.wrs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754348AbcFQAi0 (ORCPT ); Thu, 16 Jun 2016 20:38:26 -0400 From: Paul Gortmaker To: CC: Paul Gortmaker , Ezequiel Garcia , Thomas Petazzoni , Jason Cooper Subject: [PATCH 2/6] memory: mvebu-devbus: make it explicitly non-modular Date: Thu, 16 Jun 2016 20:37:44 -0400 Message-ID: <20160617003748.12188-3-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.8.4 In-Reply-To: <20160617003748.12188-1-paul.gortmaker@windriver.com> References: <20160617003748.12188-1-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 The Kconfig for this option is currently: config MVEBU_DEVBUS bool "Marvell EBU Device Bus Controller" ...meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modularity, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. An alternate init level might be worth considering at a later date. We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments. Cc: Ezequiel Garcia Cc: Thomas Petazzoni Cc: Jason Cooper Signed-off-by: Paul Gortmaker --- drivers/memory/mvebu-devbus.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/memory/mvebu-devbus.c b/drivers/memory/mvebu-devbus.c index 24852812fd44..543eeec47bd1 100644 --- a/drivers/memory/mvebu-devbus.c +++ b/drivers/memory/mvebu-devbus.c @@ -2,6 +2,8 @@ * Marvell EBU SoC Device Bus Controller * (memory controller for NOR/NAND/SRAM/FPGA devices) * + * Author: Ezequiel Garcia + * * Copyright (C) 2013-2014 Marvell * * This program is free software: you can redistribute it and/or modify @@ -19,7 +21,7 @@ */ #include -#include +#include #include #include #include @@ -340,7 +342,6 @@ static const struct of_device_id mvebu_devbus_of_match[] = { { .compatible = "marvell,orion-devbus" }, {}, }; -MODULE_DEVICE_TABLE(of, mvebu_devbus_of_match); static struct platform_driver mvebu_devbus_driver = { .probe = mvebu_devbus_probe, @@ -354,8 +355,4 @@ static int __init mvebu_devbus_init(void) { return platform_driver_register(&mvebu_devbus_driver); } -module_init(mvebu_devbus_init); - -MODULE_LICENSE("GPL v2"); -MODULE_AUTHOR("Ezequiel Garcia "); -MODULE_DESCRIPTION("Marvell EBU SoC Device Bus controller"); +device_initcall(mvebu_devbus_init); -- 2.8.4