Commit 188e8719 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Stephen Boyd

clk: mvebu: make ap806-system-controller explicitly non-modular

The Kconfig currently controlling compilation of this code is:

drivers/clk/mvebu/Kconfig:config ARMADA_AP806_SYSCON
drivers/clk/mvebu/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.

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.

We also delete the MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.

Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: linux-clk@vger.kernel.org
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 7acf751e
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/mfd/syscon.h> #include <linux/mfd/syscon.h>
#include <linux/module.h> #include <linux/init.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
...@@ -135,34 +135,17 @@ static int ap806_syscon_clk_probe(struct platform_device *pdev) ...@@ -135,34 +135,17 @@ static int ap806_syscon_clk_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int ap806_syscon_clk_remove(struct platform_device *pdev)
{
of_clk_del_provider(pdev->dev.of_node);
clk_unregister_fixed_factor(ap806_clks[3]);
clk_unregister_fixed_rate(ap806_clks[2]);
clk_unregister_fixed_rate(ap806_clks[1]);
clk_unregister_fixed_rate(ap806_clks[0]);
return 0;
}
static const struct of_device_id ap806_syscon_of_match[] = { static const struct of_device_id ap806_syscon_of_match[] = {
{ .compatible = "marvell,ap806-system-controller", }, { .compatible = "marvell,ap806-system-controller", },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, armada8k_pcie_of_match);
static struct platform_driver ap806_syscon_driver = { static struct platform_driver ap806_syscon_driver = {
.probe = ap806_syscon_clk_probe, .probe = ap806_syscon_clk_probe,
.remove = ap806_syscon_clk_remove,
.driver = { .driver = {
.name = "marvell-ap806-system-controller", .name = "marvell-ap806-system-controller",
.of_match_table = ap806_syscon_of_match, .of_match_table = ap806_syscon_of_match,
.suppress_bind_attrs = true,
}, },
}; };
builtin_platform_driver(ap806_syscon_driver);
module_platform_driver(ap806_syscon_driver);
MODULE_DESCRIPTION("Marvell AP806 System Controller driver");
MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
MODULE_LICENSE("GPL");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment