From a718ce38d4cdcd1377d5b2e40b10acd80e63af29 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Mon, 4 Jul 2016 17:12:11 -0400 Subject: clk: meson8b: make it explicitly non-modular The Kconfig currently controlling compilation of this code is: drivers/clk/meson/Kconfig:config COMMON_CLK_MESON8B drivers/clk/meson/Kconfig: bool ...meaning that it currently is not being built as a module by anyone. However a recent commit added a bunch of modular boilerplate to this driver. 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/ALIAS are no-op when non-modular. 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: 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 Signed-off-by: Michael Turquette Link: lkml.kernel.org/r/20160704211220.5685-2-paul.gortmaker@windriver.com diff --git a/drivers/clk/meson/meson8b-clkc.c b/drivers/clk/meson/meson8b-clkc.c index b1902e9..4c9413c 100644 --- a/drivers/clk/meson/meson8b-clkc.c +++ b/drivers/clk/meson/meson8b-clkc.c @@ -1,4 +1,6 @@ /* + * AmLogic S805 / Meson8b Clock Controller Driver + * * Copyright (c) 2015 Endless Mobile, Inc. * Author: Carlo Caione * @@ -23,7 +25,7 @@ #include #include #include -#include +#include #include "clkc.h" @@ -429,7 +431,6 @@ static const struct of_device_id meson8b_clkc_match_table[] = { { .compatible = "amlogic,meson8b-clkc" }, { } }; -MODULE_DEVICE_TABLE(of, meson8b_match_table); static struct platform_driver meson8b_driver = { .probe = meson8b_clkc_probe, @@ -443,16 +444,4 @@ static int __init meson8b_clkc_init(void) { return platform_driver_register(&meson8b_driver); } -module_init(meson8b_clkc_init); - -static void __exit meson8b_clkc_exit(void) -{ - platform_driver_unregister(&meson8b_driver); -} -module_exit(meson8b_clkc_exit); - -MODULE_DESCRIPTION("AmLogic S805 / Meson8b Clock Controller Driver"); -MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("platform:meson8b-clkc"); -MODULE_AUTHOR("Michael Turquette "); -MODULE_AUTHOR("Carlo Caione "); +device_initcall(meson8b_clkc_init); -- cgit v0.10.2