From patchwork Mon Jul 4 21:12:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 9213151 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7826660752 for ; Mon, 4 Jul 2016 21:14:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64BC52873F for ; Mon, 4 Jul 2016 21:14:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 594A1287A9; Mon, 4 Jul 2016 21:14:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 081592873F for ; Mon, 4 Jul 2016 21:14:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bKBBq-00088L-8u; Mon, 04 Jul 2016 21:14:02 +0000 Received: from mail.windriver.com ([147.11.1.11]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bKBBk-0007W0-GU for linux-amlogic@lists.infradead.org; Mon, 04 Jul 2016 21:14:00 +0000 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id u64LCmhh013631 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Mon, 4 Jul 2016 14:12:48 -0700 (PDT) Received: from yow-lpgnfs-02.corp.ad.wrs.com (128.224.149.8) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.248.2; Mon, 4 Jul 2016 14:12:47 -0700 From: Paul Gortmaker To: Subject: [PATCH 02/10] clk: meson: make gxbb explicitly non-modular Date: Mon, 4 Jul 2016 17:12:12 -0400 Message-ID: <20160704211220.5685-3-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.8.4 In-Reply-To: <20160704211220.5685-1-paul.gortmaker@windriver.com> References: <20160704211220.5685-1-paul.gortmaker@windriver.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160704_141356_630424_533620E8 X-CRM114-Status: GOOD ( 18.84 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Hilman , Michael Turquette , Stephen Boyd , Paul Gortmaker , Carlo Caione , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The Kconfig currently controlling compilation of this code is: drivers/clk/meson/Kconfig:config COMMON_CLK_GXBB drivers/clk/meson/Kconfig: bool ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, 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. Also note that MODULE_DEVICE_TABLE and ALIAS are no-op for non-modules. 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: Michael Turquette Cc: Stephen Boyd Cc: Carlo Caione Cc: Kevin Hilman Cc: linux-clk@vger.kernel.org Cc: linux-amlogic@lists.infradead.org Signed-off-by: Paul Gortmaker --- drivers/clk/meson/gxbb.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 007b7157cf4b..a4c6684b3019 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -1,4 +1,6 @@ /* + * AmLogic S905 / GXBB Clock Controller Driver + * * Copyright (c) 2016 AmLogic, Inc. * Michael Turquette * @@ -19,7 +21,7 @@ #include #include #include -#include +#include #include "clkc.h" #include "gxbb.h" @@ -926,7 +928,6 @@ static const struct of_device_id gxbb_clkc_match_table[] = { { .compatible = "amlogic,gxbb-clkc" }, { } }; -MODULE_DEVICE_TABLE(of, gxbb_match_table); static struct platform_driver gxbb_driver = { .probe = gxbb_clkc_probe, @@ -940,15 +941,4 @@ static int __init gxbb_clkc_init(void) { return platform_driver_register(&gxbb_driver); } -module_init(gxbb_clkc_init); - -static void __exit gxbb_clkc_exit(void) -{ - platform_driver_unregister(&gxbb_driver); -} -module_exit(gxbb_clkc_exit); - -MODULE_DESCRIPTION("AmLogic S905 / GXBB Clock Controller Driver"); -MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("platform:gxbb-clkc"); -MODULE_AUTHOR("Michael Turquette "); +device_initcall(gxbb_clkc_init);