Commit 80c6397c authored Jul 04, 2016 by Paul Gortmaker Committed by Michael Turquette Jul 06, 2016

clk: oxnas: make it explicitly non-modular



The Kconfig currently controlling compilation of this code is:

drivers/clk/Kconfig:config COMMON_CLK_OXNAS
drivers/clk/Kconfig:    bool "Clock driver for the OXNAS SoC Family"

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

We explicitly disallow a driver unbind, since that doesn't have a
sensible use case anyway, and it allows us to drop the ".remove"
code for non-modular drivers.

Since module_platform_driver() uses the same init level priority as
builtin_platform_driver() the init ordering remains unchanged with
this commit.

Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.

Cc: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Cc: linux-clk@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
Link: lkml.kernel.org/r/20160704211220.5685-6-paul.gortmaker@windriver.com

parent cb98fd5d

drivers/clk/clk-oxnas.c

+3 −12

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@

		#include <linux/clk-provider.h>
		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/of.h>
		#include <linux/platform_device.h>
		#include <linux/stringify.h>
		@@ -170,26 +170,17 @@ static int oxnas_stdclk_probe(struct platform_device *pdev)
		clk_oxnas->onecell_data);
		}

		static int oxnas_stdclk_remove(struct platform_device *pdev)
		{
		of_clk_del_provider(pdev->dev.of_node);

		return 0;
		}

		static const struct of_device_id oxnas_stdclk_dt_ids[] = {
		{ .compatible = "oxsemi,ox810se-stdclk" },
		{ }
		};
		MODULE_DEVICE_TABLE(of, oxnas_stdclk_dt_ids);

		static struct platform_driver oxnas_stdclk_driver = {
		.probe = oxnas_stdclk_probe,
		.remove = oxnas_stdclk_remove,
		.driver = {
		.name = "oxnas-stdclk",
		.suppress_bind_attrs = true,
		.of_match_table = oxnas_stdclk_dt_ids,
		},
		};

		module_platform_driver(oxnas_stdclk_driver);
		builtin_platform_driver(oxnas_stdclk_driver);

Admin message